diff options
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/add-system-image.xml.in (renamed from op-mode-definitions/add-system-image.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/clear-ip.xml.in (renamed from op-mode-definitions/clear-ip.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/clear-ipv6.xml.in (renamed from op-mode-definitions/clear-ipv6.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/configure.xml.in (renamed from op-mode-definitions/configure.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/connect.xml.in (renamed from op-mode-definitions/connect.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/date.xml.in (renamed from op-mode-definitions/date.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/dhcp.xml.in (renamed from op-mode-definitions/dhcp.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/disconnect.xml.in (renamed from op-mode-definitions/disconnect.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/disks.xml.in (renamed from op-mode-definitions/disks.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/dns-dynamic.xml.in (renamed from op-mode-definitions/dns-dynamic.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/dns-forwarding.xml.in (renamed from op-mode-definitions/dns-forwarding.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/flow-accounting-op.xml.in (renamed from op-mode-definitions/flow-accounting-op.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/force-arp.xml.in (renamed from op-mode-definitions/force-arp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/force-ipv6-nd.xml.in (renamed from op-mode-definitions/force-ipv6-nd.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/force-ipv6-rd.xml.in (renamed from op-mode-definitions/force-ipv6-rd.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/force-mtu-host.xml.in (renamed from op-mode-definitions/force-mtu-host.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/generate-macsec-key.xml.in (renamed from op-mode-definitions/generate-macsec-key.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/generate-ssh-server-key.xml | 16 | ||||
| -rw-r--r-- | op-mode-definitions/generate-ssh-server-key.xml.in | 32 | ||||
| -rw-r--r-- | op-mode-definitions/igmp-proxy.xml.in (renamed from op-mode-definitions/igmp-proxy.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/include/bgp-afi-common.xml.i | 40 | ||||
| -rw-r--r-- | op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i | 243 | ||||
| -rw-r--r-- | op-mode-definitions/include/bgp-common.xml.i | 170 | ||||
| -rw-r--r-- | op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i | 20 | ||||
| -rw-r--r-- | op-mode-definitions/include/isis-common.xml.i | 179 | ||||
| -rw-r--r-- | op-mode-definitions/include/monitor-background.xml.i | 21 | ||||
| -rw-r--r-- | op-mode-definitions/include/monitor-no-ospf-packet-detail.xml.i | 36 | ||||
| -rw-r--r-- | op-mode-definitions/include/monitor-ospf-packet-detail.xml.i | 36 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospf-common.xml.i | 559 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i | 17 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-adv-router.xml.i | 16 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-detail.xml.i | 9 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-dump.xml.i | 9 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-internal.xml.i | 9 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i | 18 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-linkstate-id.xml.i | 15 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-self-originated.xml.i | 14 | ||||
| -rw-r--r-- | op-mode-definitions/include/vni-tagnode-all.xml.i | 11 | ||||
| -rw-r--r-- | op-mode-definitions/include/vni-tagnode.xml.i | 11 | ||||
| -rw-r--r-- | op-mode-definitions/include/vtysh-generic-detail.xml.i | 8 | ||||
| -rw-r--r-- | op-mode-definitions/ipoe-server.xml.in (renamed from op-mode-definitions/ipoe-server.xml) | 14 | ||||
| -rw-r--r-- | op-mode-definitions/ipv4-route.xml.in (renamed from op-mode-definitions/ipv4-route.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/ipv6-route.xml.in (renamed from op-mode-definitions/ipv6-route.xml) | 40 | ||||
| -rw-r--r-- | op-mode-definitions/l2tp-server.xml.in (renamed from op-mode-definitions/l2tp-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/lldp.xml.in (renamed from op-mode-definitions/lldp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-bandwidth-test.xml.in (renamed from op-mode-definitions/monitor-bandwidth-test.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-bandwidth.xml.in (renamed from op-mode-definitions/monitor-bandwidth.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-log.xml.in (renamed from op-mode-definitions/monitor-log.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-ndp.xml.in (renamed from op-mode-definitions/monitor-ndp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-protocol.xml.in | 1542 | ||||
| -rw-r--r-- | op-mode-definitions/nat.xml.in (renamed from op-mode-definitions/nat.xml) | 10 | ||||
| -rw-r--r-- | op-mode-definitions/nat66.xml.in | 98 | ||||
| -rw-r--r-- | op-mode-definitions/openconnect.xml.in (renamed from op-mode-definitions/openconnect.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/openvpn.xml.in (renamed from op-mode-definitions/openvpn.xml) | 1 | ||||
| -rw-r--r-- | op-mode-definitions/ping.xml.in (renamed from op-mode-definitions/ping.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/poweroff.xml.in (renamed from op-mode-definitions/poweroff.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/pppoe-server.xml.in (renamed from op-mode-definitions/pppoe-server.xml) | 12 | ||||
| -rw-r--r-- | op-mode-definitions/pptp-server.xml.in (renamed from op-mode-definitions/pptp-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reboot.xml.in (renamed from op-mode-definitions/reboot.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-conntrack.xml.in (renamed from op-mode-definitions/reset-conntrack.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ip-bgp.xml.in (renamed from op-mode-definitions/reset-ip-bgp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ip-igmp.xml.in (renamed from op-mode-definitions/reset-ip-igmp.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ip-multicast.xml.in (renamed from op-mode-definitions/reset-ip-multicast.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ipv6-bgp.xml.in (renamed from op-mode-definitions/reset-ipv6-bgp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-mpls.xml.in (renamed from op-mode-definitions/reset-mpls.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/reset-vpn.xml.in (renamed from op-mode-definitions/reset-vpn.xml) | 26 | ||||
| -rw-r--r-- | op-mode-definitions/restart-frr.xml.in (renamed from op-mode-definitions/restart-frr.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/restart-snmp.xml.in | 13 | ||||
| -rw-r--r-- | op-mode-definitions/restart-ssh.xml.in | 13 | ||||
| -rw-r--r-- | op-mode-definitions/restart.xml.in (renamed from op-mode-definitions/restart.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-acceleration.xml.in (renamed from op-mode-definitions/show-acceleration.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-bgp.xml.in | 257 | ||||
| -rw-r--r-- | op-mode-definitions/show-bridge.xml.in (renamed from op-mode-definitions/show-bridge.xml) | 6 | ||||
| -rw-r--r-- | op-mode-definitions/show-configuration.xml.in (renamed from op-mode-definitions/show-configuration.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-console-server.xml.in (renamed from op-mode-definitions/show-console-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-environment.xml.in (renamed from op-mode-definitions/show-environment.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-evpn.xml.in | 46 | ||||
| -rw-r--r-- | op-mode-definitions/show-hardware.xml.in (renamed from op-mode-definitions/show-hardware.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-history.xml.in (renamed from op-mode-definitions/show-history.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-host.xml.in (renamed from op-mode-definitions/show-host.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-bonding.xml.in (renamed from op-mode-definitions/show-interfaces-bonding.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-bridge.xml.in (renamed from op-mode-definitions/show-interfaces-bridge.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-dummy.xml.in (renamed from op-mode-definitions/show-interfaces-dummy.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-ethernet.xml.in (renamed from op-mode-definitions/show-interfaces-ethernet.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-input.xml.in (renamed from op-mode-definitions/show-interfaces-input.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-l2tpv3.xml.in (renamed from op-mode-definitions/show-interfaces-l2tpv3.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-loopback.xml.in (renamed from op-mode-definitions/show-interfaces-loopback.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-macsec.xml.in (renamed from op-mode-definitions/show-interfaces-macsec.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-pppoe.xml.in (renamed from op-mode-definitions/show-interfaces-pppoe.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in (renamed from op-mode-definitions/show-interfaces-pseudo-ethernet.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-tunnel.xml.in (renamed from op-mode-definitions/show-interfaces-tunnel.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-vti.xml.in (renamed from op-mode-definitions/show-interfaces-vti.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-vxlan.xml.in (renamed from op-mode-definitions/show-interfaces-vxlan.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-wirelessmodem.xml.in (renamed from op-mode-definitions/show-interfaces-wirelessmodem.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces.xml.in (renamed from op-mode-definitions/show-interfaces.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in (renamed from op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml) | 28 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-bgp.xml | 342 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-bgp.xml.in | 32 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-igmp.xml.in (renamed from op-mode-definitions/show-ip-igmp.xml) | 10 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-multicast.xml.in (renamed from op-mode-definitions/show-ip-multicast.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-ospf.xml | 579 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-ospf.xml.in | 36 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-pim.xml.in (renamed from op-mode-definitions/show-ip-pim.xml) | 18 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-ports.xml.in (renamed from op-mode-definitions/show-ip-ports.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-rip.xml.in (renamed from op-mode-definitions/show-ip-rip.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-route.xml.in (renamed from op-mode-definitions/show-ip-route.xml) | 30 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip.xml.in | 20 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-bgp.xml | 203 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-ospfv3.xml | 777 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-ospfv3.xml.in | 502 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-prefix-list.xml.in (renamed from op-mode-definitions/show-ipv6-prefix-list.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-route.xml.in (renamed from op-mode-definitions/show-ipv6-route.xml) | 64 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6.xml.in (renamed from op-mode-definitions/show-ipv6.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-isis.xml | 191 | ||||
| -rw-r--r-- | op-mode-definitions/show-isis.xml.in | 27 | ||||
| -rw-r--r-- | op-mode-definitions/show-license.xml.in (renamed from op-mode-definitions/show-license.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-log.xml.in (renamed from op-mode-definitions/show-log.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-login.xml.in (renamed from op-mode-definitions/show-login.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-monitoring.xml.in (renamed from op-mode-definitions/show-monitoring.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-mpls.xml.in (renamed from op-mode-definitions/show-mpls.xml) | 62 | ||||
| -rw-r--r-- | op-mode-definitions/show-ntp.xml.in (renamed from op-mode-definitions/show-ntp.xml) | 9 | ||||
| -rw-r--r-- | op-mode-definitions/show-poweroff.xml.in (renamed from op-mode-definitions/show-poweroff.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-protocols-bfd.xml.in (renamed from op-mode-definitions/show-protocols-bfd.xml) | 12 | ||||
| -rw-r--r-- | op-mode-definitions/show-protocols-static.xml.in (renamed from op-mode-definitions/show-protocols-static.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-raid.xml.in (renamed from op-mode-definitions/show-raid.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-reboot.xml.in (renamed from op-mode-definitions/show-reboot.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-route-map.xml.in (renamed from op-mode-definitions/show-route-map.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/show-rpki.xml.in (renamed from op-mode-definitions/show-rpki.xml) | 6 | ||||
| -rw-r--r-- | op-mode-definitions/show-system.xml.in (renamed from op-mode-definitions/show-system.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/show-table.xml.in (renamed from op-mode-definitions/show-table.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-users.xml.in (renamed from op-mode-definitions/show-users.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-version.xml.in (renamed from op-mode-definitions/show-version.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/show-vpn.xml.in (renamed from op-mode-definitions/show-vpn.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-vrf.xml.in (renamed from op-mode-definitions/show-vrf.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-zebra.xml.in | 54 | ||||
| -rw-r--r-- | op-mode-definitions/snmp.xml.in (renamed from op-mode-definitions/snmp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/sstp-server.xml.in (renamed from op-mode-definitions/sstp-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/telnet.xml.in (renamed from op-mode-definitions/telnet.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/terminal.xml.in (renamed from op-mode-definitions/terminal.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/traceroute.xml.in (renamed from op-mode-definitions/traceroute.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/traffic-dump.xml.in (renamed from op-mode-definitions/traffic-dump.xml) | 28 | ||||
| -rw-r--r-- | op-mode-definitions/vrrp.xml.in (renamed from op-mode-definitions/vrrp.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/wake-on-lan.xml.in (renamed from op-mode-definitions/wake-on-lan.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/webproxy.xml.in (renamed from op-mode-definitions/webproxy.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/wireguard.xml.in (renamed from op-mode-definitions/wireguard.xml) | 35 | ||||
| -rw-r--r-- | op-mode-definitions/wireless.xml.in (renamed from op-mode-definitions/wireless.xml) | 0 |
146 files changed, 4356 insertions, 2328 deletions
diff --git a/op-mode-definitions/add-system-image.xml b/op-mode-definitions/add-system-image.xml.in index 3dc1c67ab..67d8aa3b4 100644 --- a/op-mode-definitions/add-system-image.xml +++ b/op-mode-definitions/add-system-image.xml.in @@ -11,7 +11,7 @@ <properties> <help>Add a new image to the system</help> <completionHelp> - <list>/path/to/vyos-image.iso http://example.com/vyos-image.iso</list> + <list>/path/to/vyos-image.iso "http://example.com/vyos-image.iso"</list> </completionHelp> </properties> <command>sudo ${vyatta_sbindir}/install-image --url "${4}"</command> diff --git a/op-mode-definitions/clear-ip.xml b/op-mode-definitions/clear-ip.xml.in index 3c75ed11b..3c75ed11b 100644 --- a/op-mode-definitions/clear-ip.xml +++ b/op-mode-definitions/clear-ip.xml.in diff --git a/op-mode-definitions/clear-ipv6.xml b/op-mode-definitions/clear-ipv6.xml.in index c062102fc..c062102fc 100644 --- a/op-mode-definitions/clear-ipv6.xml +++ b/op-mode-definitions/clear-ipv6.xml.in diff --git a/op-mode-definitions/configure.xml b/op-mode-definitions/configure.xml.in index 3dd5a0f45..3dd5a0f45 100644 --- a/op-mode-definitions/configure.xml +++ b/op-mode-definitions/configure.xml.in diff --git a/op-mode-definitions/connect.xml b/op-mode-definitions/connect.xml.in index 1ec62949a..1ec62949a 100644 --- a/op-mode-definitions/connect.xml +++ b/op-mode-definitions/connect.xml.in diff --git a/op-mode-definitions/date.xml b/op-mode-definitions/date.xml.in index 15a69dbd9..15a69dbd9 100644 --- a/op-mode-definitions/date.xml +++ b/op-mode-definitions/date.xml.in diff --git a/op-mode-definitions/dhcp.xml b/op-mode-definitions/dhcp.xml.in index 48752cfd5..1dacbd5ba 100644 --- a/op-mode-definitions/dhcp.xml +++ b/op-mode-definitions/dhcp.xml.in @@ -123,7 +123,7 @@ <children> <node name="dhcp"> <properties> - <help>Restart DHCP processes</help> + <help>Restart DHCP server processes</help> </properties> <children> <node name="server"> @@ -142,7 +142,7 @@ </node> <node name="dhcpv6"> <properties> - <help>Restart DHCPv6 processes</help> + <help>Restart DHCPv6 server processes</help> </properties> <children> <node name="server"> diff --git a/op-mode-definitions/disconnect.xml b/op-mode-definitions/disconnect.xml.in index bf2c37b89..bf2c37b89 100644 --- a/op-mode-definitions/disconnect.xml +++ b/op-mode-definitions/disconnect.xml.in diff --git a/op-mode-definitions/disks.xml b/op-mode-definitions/disks.xml.in index fb39c4f3c..fb39c4f3c 100644 --- a/op-mode-definitions/disks.xml +++ b/op-mode-definitions/disks.xml.in diff --git a/op-mode-definitions/dns-dynamic.xml b/op-mode-definitions/dns-dynamic.xml.in index 9c37874fb..9c37874fb 100644 --- a/op-mode-definitions/dns-dynamic.xml +++ b/op-mode-definitions/dns-dynamic.xml.in diff --git a/op-mode-definitions/dns-forwarding.xml b/op-mode-definitions/dns-forwarding.xml.in index 23de97704..36fe6b5ef 100644 --- a/op-mode-definitions/dns-forwarding.xml +++ b/op-mode-definitions/dns-forwarding.xml.in @@ -45,7 +45,7 @@ <children> <node name="dns"> <properties> - <help>Restart a DNS service</help> + <help>Restart specific DNS service</help> </properties> <children> <leafNode name="forwarding"> diff --git a/op-mode-definitions/flow-accounting-op.xml b/op-mode-definitions/flow-accounting-op.xml.in index 912805d59..b847338f9 100644 --- a/op-mode-definitions/flow-accounting-op.xml +++ b/op-mode-definitions/flow-accounting-op.xml.in @@ -55,7 +55,7 @@ <children> <leafNode name="flow-accounting"> <properties> - <help>Restart flow-accounting service</help> + <help>Restart (net)flow accounting process</help> </properties> <command>${vyos_op_scripts_dir}/flow_accounting_op.py --action restart</command> </leafNode> diff --git a/op-mode-definitions/force-arp.xml b/op-mode-definitions/force-arp.xml.in index f9f7c7643..f9f7c7643 100644 --- a/op-mode-definitions/force-arp.xml +++ b/op-mode-definitions/force-arp.xml.in diff --git a/op-mode-definitions/force-ipv6-nd.xml b/op-mode-definitions/force-ipv6-nd.xml.in index 49de097f6..49de097f6 100644 --- a/op-mode-definitions/force-ipv6-nd.xml +++ b/op-mode-definitions/force-ipv6-nd.xml.in diff --git a/op-mode-definitions/force-ipv6-rd.xml b/op-mode-definitions/force-ipv6-rd.xml.in index 8c901af25..8c901af25 100644 --- a/op-mode-definitions/force-ipv6-rd.xml +++ b/op-mode-definitions/force-ipv6-rd.xml.in diff --git a/op-mode-definitions/force-mtu-host.xml b/op-mode-definitions/force-mtu-host.xml.in index b92179f11..b92179f11 100644 --- a/op-mode-definitions/force-mtu-host.xml +++ b/op-mode-definitions/force-mtu-host.xml.in diff --git a/op-mode-definitions/generate-macsec-key.xml b/op-mode-definitions/generate-macsec-key.xml.in index 40d2b9061..40d2b9061 100644 --- a/op-mode-definitions/generate-macsec-key.xml +++ b/op-mode-definitions/generate-macsec-key.xml.in diff --git a/op-mode-definitions/generate-ssh-server-key.xml b/op-mode-definitions/generate-ssh-server-key.xml deleted file mode 100644 index a6ebf1b78..000000000 --- a/op-mode-definitions/generate-ssh-server-key.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="generate"> - <properties> - <help>Generate an object</help> - </properties> - <children> - <node name="ssh-server-key"> - <properties> - <help>Regenerate the host SSH keys and restart the SSH server</help> - </properties> - <command>${vyos_op_scripts_dir}/generate_ssh_server_key.py</command> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/generate-ssh-server-key.xml.in b/op-mode-definitions/generate-ssh-server-key.xml.in new file mode 100644 index 000000000..86bb1b1bd --- /dev/null +++ b/op-mode-definitions/generate-ssh-server-key.xml.in @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="generate"> + <properties> + <help>Generate an object/key</help> + </properties> + <children> + <node name="ssh"> + <properties> + <help>Generate SSH related keypairs</help> + </properties> + <children> + <node name="server-key"> + <properties> + <help>Re-generate SSH host keys and restart SSH server</help> + </properties> + <command>${vyos_op_scripts_dir}/generate_ssh_server_key.py</command> + </node> + <tagNode name="client-key"> + <properties> + <help>Re-generate SSH client keypair</help> + <completionHelp> + <list><filename></list> + </completionHelp> + </properties> + <command>ssh-keygen -t rsa -f "$4" -N ""</command> + </tagNode> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/igmp-proxy.xml b/op-mode-definitions/igmp-proxy.xml.in index 8533138d7..8533138d7 100644 --- a/op-mode-definitions/igmp-proxy.xml +++ b/op-mode-definitions/igmp-proxy.xml.in diff --git a/op-mode-definitions/include/bgp-afi-common.xml.i b/op-mode-definitions/include/bgp-afi-common.xml.i new file mode 100644 index 000000000..06cfc42a5 --- /dev/null +++ b/op-mode-definitions/include/bgp-afi-common.xml.i @@ -0,0 +1,40 @@ +<!-- included start from bgp-afi-common.xml.i --> +<tagNode name="community"> + <properties> + <help>Community number where AA and NN are (0-65535)</help> + <completionHelp> + <list>AA:NN</list> + </completionHelp> + </properties> + <children> + <leafNode name="exact-match"> + <properties> + <help>Exact match of the communities</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<tagNode name="large-community"> + <properties> + <help>List of large-community numbers</help> + <completionHelp> + <list>AA:BB:CC</list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<leafNode name="statistics"> + <properties> + <help>RIB advertisement statistics</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<leafNode name="summary"> + <properties> + <help>Summary of BGP neighbor status</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<!-- included end --> diff --git a/op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i b/op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i new file mode 100644 index 000000000..dc0926375 --- /dev/null +++ b/op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i @@ -0,0 +1,243 @@ +<!-- included start from bgp-afi-ipv4-ipv6-common.xml.i --> +<node name="community"> + <properties> + <help>Display routes matching the community</help> + </properties> + <children> + <leafNode name="accept-own"> + <properties> + <help>Should accept local VPN route if exported and imported into different VRF (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="accept-own-nexthop"> + <properties> + <help>Should accept VPN route with local nexthop (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="blackhole"> + <properties> + <help>Inform EBGP peers to blackhole traffic to prefix (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="exact-match"> + <properties> + <help>Exact match of the communities</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="graceful-shutdown"> + <properties> + <help>Graceful shutdown (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="llgr-stale"> + <properties> + <help>Staled Long-lived Graceful Restart VPN route (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="local-AS"> + <properties> + <help>Do not send outside local AS (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="no-advertise"> + <properties> + <help>Do not advertise to any peer (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="no-export"> + <properties> + <help>Do not export to next AS (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="no-llgr"> + <properties> + <help>Removed because Long-lived Graceful Restart was not enabled for VPN route (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="no-peer"> + <properties> + <help>Do not export to any peer (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="route-filter-translated-v4"> + <properties> + <help>RT translated VPNv4 route filtering (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="route-filter-translated-v6"> + <properties> + <help>RT translated VPNv6 route filtering (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="route-filter-v4"> + <properties> + <help>RT VPNv4 route filtering (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="route-filter-v6"> + <properties> + <help>RT VPNv6 route filtering (well-known community)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</node> +<tagNode name="community-list"> + <properties> + <help>Display routes matching the community-list</help> + <completionHelp> + <list>1-500 name</list> + </completionHelp> + </properties> + <children> + <leafNode name="exact-match"> + <properties> + <help>Show BGP routes exactly matching specified community list</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<node name="dampening"> + <properties> + <help>Display detailed information about dampening</help> + </properties> + <children> + <leafNode name="dampened-paths"> + <properties> + <help>Display paths suppressed due to dampening</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="flap-statistics"> + <properties> + <help>Display flap statistics of routes</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="parameters"> + <properties> + <help>Display detail of configured dampening parameters</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> +</node> +<tagNode name="filter-list"> + <properties> + <help>Display routes conforming to the filter-list</help> + <completionHelp> + <script>vtysh -c 'show bgp as-path-access-list' | grep 'AS path access list' | awk '{print $NF}'</script> + </completionHelp> + </properties> +</tagNode> +<node name="large-community"> + <properties> + <help>Show BGP routes matching the specified large-communities</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</node> +<leafNode name="neighbors"> + <properties> + <help>Detailed information on TCP and BGP neighbor connections</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<tagNode name="neighbors"> + <properties> + <help>Show detailed BGP IPv4 unicast neighbor information</help> + <completionHelp> + <script>vtysh -c 'show bgp summary' | awk '{print $1'} | grep -e '^[0-9a-f]'</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <leafNode name="advertised-routes"> + <properties> + <help>Show routes advertised to a BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="dampened-routes"> + <properties> + <help>Show dampened routes received from BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="flap-statistics"> + <properties> + <help>Show flap statistics of the routes learned from BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="prefix-counts"> + <properties> + <help>Show detailed prefix count information for BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <node name="received"> + <properties> + <help>Show information received from BGP neighbor</help> + </properties> + <children> + <leafNode name="prefix-filter"> + <properties> + <help>Show prefixlist filter</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </node> + <leafNode name="received-routes"> + <properties> + <help>Show received routes from BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="routes"> + <properties> + <help>Show routes learned from BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> +</tagNode> +<tagNode name="prefix-list"> + <properties> + <help>Display routes conforming to the prefix-list</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<tagNode name="regexp"> + <properties> + <help>Display routes matching the AS path regular expression</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<tagNode name="route-map"> + <properties> + <help>Show BGP routes matching the specified route map</help> + <completionHelp> + <path>policy route-map</path> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<!-- included end --> diff --git a/op-mode-definitions/include/bgp-common.xml.i b/op-mode-definitions/include/bgp-common.xml.i new file mode 100644 index 000000000..a1154d965 --- /dev/null +++ b/op-mode-definitions/include/bgp-common.xml.i @@ -0,0 +1,170 @@ +<!-- included start from bgp-common.xml.i --> +<leafNode name="attribute-info"> + <properties> + <help>Show BGP attribute information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<leafNode name="cidr-only"> + <properties> + <help>Display only routes with non-natural netmasks</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<leafNode name="community-info"> + <properties> + <help>List all bgp community information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +#include <include/bgp-afi-common.xml.i> +#include <include/bgp-afi-ipv4-ipv6-common.xml.i> +<tagNode name="prefix-list"> + <properties> + <completionHelp> + <path>policy prefix-list</path> + </completionHelp> + </properties> +</tagNode> +<node name="ipv4"> + <properties> + <help>Show BGP IPv4 information</help> + </properties> + <children> + <node name="unicast"> + <properties> + <help>Show BGP IPv4 unicast information</help> + </properties> + <children> + <leafNode name="cidr-only"> + <properties> + <help>Display only routes with non-natural netmasks</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <node name="community"> + <properties> + <help>Show BGP routes matching the communities</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </node> + <tagNode name="community"> + <properties> + <help>Display routes matching the specified communities</help> + <completionHelp> +<list><AA:NN> local-AS no-advertise no-export</list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <tagNode name="community-list"> + <properties> + <help>Show BGP routes matching specified community list</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <leafNode name="exact-match"> +<properties> + <help>Show BGP routes exactly matching specified community list</help> +</properties> +<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <tagNode name="neighbors"> + <properties> + <help>Show detailed BGP IPv4 unicast neighbor information</help> + <completionHelp> +<script>vtysh -c "show ip bgp ipv4 unicast summary" | awk '{print $1}' | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b"</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <leafNode name="advertised-routes"> +<properties> + <help>Show routes advertised to a BGP neighbor</help> +</properties> +<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="prefix-counts"> +<properties> + <help>Show detailed prefix count information</help> +</properties> +<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="received-routes"> +<properties> + <help>Show the received routes from neighbor</help> +</properties> +<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="routes"> +<properties> + <help>Show routes learned from neighbor</help> +</properties> +<command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <leafNode name="paths"> + <properties> + <help>Show BGP path information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <tagNode name="prefix-list"> + <properties> + <help>Show BGP routes matching the specified prefix list</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <tagNode name="regexp"> + <properties> + <help>Show BGP routes matching the specified AS path regular expression</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <tagNode name="route-map"> + <properties> + <help>Show BGP routes matching the specified route map</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="summary"> + <properties> + <help>Show summary of BGP information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </node> + <tagNode name="unicast"> + <properties> + <help>Show BGP information for specified IP address or prefix</help> + <completionHelp> + <list><x.x.x.x> <x.x.x.x/x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + </children> +</node> +<leafNode name="large-community-info"> + <properties> + <help>Show BGP large-community information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<leafNode name="memory"> + <properties> + <help>Show BGP memory usage</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<leafNode name="paths"> + <properties> + <help>Show BGP path information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<!-- included end --> diff --git a/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i b/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i new file mode 100644 index 000000000..224fa6b45 --- /dev/null +++ b/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i @@ -0,0 +1,20 @@ +<!-- included start from bgp-prefix-bestpath-multipath.xml.i --> +<leafNode name="bestpath"> + <properties> + <help>Display only the bestpath</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<leafNode name="multipath"> + <properties> + <help>Display only multipaths</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<leafNode name="longer-prefixes"> + <properties> + <help>Display route and more specific routes</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<!-- included end --> diff --git a/op-mode-definitions/include/isis-common.xml.i b/op-mode-definitions/include/isis-common.xml.i new file mode 100644 index 000000000..b1ee3e241 --- /dev/null +++ b/op-mode-definitions/include/isis-common.xml.i @@ -0,0 +1,179 @@ +<!-- included start from isis-common.xml.i -->
+<node name="database">
+ <properties>
+ <help>Show IS-IS link state database</help>
+ </properties>
+ <children>
+ <leafNode name="detail">
+ <properties>
+ <help>Show detailed information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ </children>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<tagNode name="database">
+ <properties>
+ <help>Show IS-IS link state database PDU</help>
+ <completionHelp>
+ <list>lsp-id detail</list>
+ </completionHelp>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<leafNode name="hostname">
+ <properties>
+ <help>Show IS-IS dynamic hostname mapping</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<node name="interface">
+ <properties>
+ <help>Show IS-IS interfaces</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_interfaces.py</script>
+ </completionHelp>
+ </properties>
+ <children>
+ <leafNode name="detail">
+ <properties>
+ <help>Show detailed information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ </children>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<tagNode name="interface">
+ <properties>
+ <help>Show specific IS-IS interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_interfaces.py</script>
+ </completionHelp>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="mpls-te">
+ <properties>
+ <help>Show IS-IS MPLS traffic engineering information</help>
+ </properties>
+ <children>
+ <leafNode name="router">
+ <properties>
+ <help>Show router information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ <leafNode name="interface">
+ <properties>
+ <help>Show interface information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ <tagNode name="interface">
+ <properties>
+ <help>Show specific IS-IS interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_interfaces.py</script>
+ </completionHelp>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </tagNode>
+ </children>
+</node>
+<node name="neighbor">
+ <properties>
+ <help>Show IS-IS neighbor adjacencies</help>
+ </properties>
+ <children>
+ <leafNode name="detail">
+ <properties>
+ <help>Show detailed information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ </children>
+ <command>vtysh -c "show isis neighbor"</command>
+</node>
+<tagNode name="neighbor">
+ <properties>
+ <help>Show specific IS-IS neighbor adjacency </help>
+ <completionHelp>
+ <list>system-id</list>
+ </completionHelp>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="route">
+ <properties>
+ <help>Show IS-IS routing table</help>
+ </properties>
+ <children>
+ <leafNode name="level-1">
+ <properties>
+ <help>Show level-1 routes</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ <leafNode name="level-2">
+ <properties>
+ <help>Show level-2 routes</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ </children>
+ <command>vtysh -c "show isis route"</command>
+</node>
+<node name="segment-routing">
+ <properties>
+ <help>Show IS-IS Segment-Routing (SPRING) information</help>
+ </properties>
+ <children>
+ <leafNode name="node">
+ <properties>
+ <help>Show node information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ <leafNode name="prefix-sids">
+ <properties>
+ <help>Show prefix segment IDs</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ </children>
+</node>
+<leafNode name="spf-delay-ietf">
+ <properties>
+ <help>Show IS-IS SPF delay parameters</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="summary">
+ <properties>
+ <help>Show IS-IS information summary</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<node name="topology">
+ <properties>
+ <help>Show IS-IS paths to Intermediate Systems</help>
+ </properties>
+ <children>
+ <leafNode name="level-1">
+ <properties>
+ <help>Show level-1 routes</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ <leafNode name="level-2">
+ <properties>
+ <help>Show level-2 routes</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+ </leafNode>
+ </children>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/monitor-background.xml.i b/op-mode-definitions/include/monitor-background.xml.i new file mode 100644 index 000000000..9931127e3 --- /dev/null +++ b/op-mode-definitions/include/monitor-background.xml.i @@ -0,0 +1,21 @@ +<!-- included start from monitor-background.xml.i --> +<node name="background"> + <properties> + <help>Monitor in background</help> + </properties> + <children> + <node name="start"> + <properties> + <help>Start background monitoring</help> + </properties> + <command>${vyatta_bindir}/vyatta-monitor-background ${3^^} ${3}</command> + </node> + <node name="stop"> + <properties> + <help>Stop background monitoring</help> + </properties> + <command>${vyatta_bindir}/vyatta-monitor-background-stop ${3^^}</command> + </node> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/monitor-no-ospf-packet-detail.xml.i b/op-mode-definitions/include/monitor-no-ospf-packet-detail.xml.i new file mode 100644 index 000000000..8dbb5acea --- /dev/null +++ b/op-mode-definitions/include/monitor-no-ospf-packet-detail.xml.i @@ -0,0 +1,36 @@ +<!-- included start from monitor-ospf-packet-detail.xml.i --> +<node name="detail"> + <properties> + <help>Disable detailed OSPF packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:3}"</command> +</node> +<node name="recv"> + <properties> + <help>Disable OSPF recv packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:3}"</command> + <children> + <node name="detail"> + <properties> + <help>Disable detailed OSPF recv packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:3}"</command> + </node> + </children> +</node> +<node name="send"> + <properties> + <help>Disable OSPF send packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:3}"</command> + <children> + <node name="detail"> + <properties> + <help>Disable detailed OSPF send packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:3}"</command> + </node> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/monitor-ospf-packet-detail.xml.i b/op-mode-definitions/include/monitor-ospf-packet-detail.xml.i new file mode 100644 index 000000000..a4bd33673 --- /dev/null +++ b/op-mode-definitions/include/monitor-ospf-packet-detail.xml.i @@ -0,0 +1,36 @@ +<!-- included start from monitor-ospf-packet-detail.xml.i --> +<node name="detail"> + <properties> + <help>Enable detailed OSPF packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:3}"</command> +</node> +<node name="recv"> + <properties> + <help>Enable OSPF recv packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:3}"</command> + <children> + <node name="detail"> + <properties> + <help>Enable detailed OSPF recv packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:3}"</command> + </node> + </children> +</node> +<node name="send"> + <properties> + <help>Enable OSPF send packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:3}"</command> + <children> + <node name="detail"> + <properties> + <help>Enable detailed OSPF send packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:3}"</command> + </node> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i new file mode 100644 index 000000000..0edc3c37f --- /dev/null +++ b/op-mode-definitions/include/ospf-common.xml.i @@ -0,0 +1,559 @@ +<!-- included start from ospf-common.xml.i --> +<leafNode name="border-routers"> + <properties> + <help>Show IPv4 OSPF border-routers information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<node name="database"> + <properties> + <help>Show IPv4 OSPF database information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="asbr-summary"> + <properties> + <help>Show IPv4 OSPF ASBR summary database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="asbr-summary"> + <properties> + <help>Show IPv4 OSPF ASBR summary database information of given address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF ASBR summary database of given address for given advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show summary of self-originate IPv4 OSPF ASBR database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <node name="external"> + <properties> + <help>Show IPv4 OSPF external database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF external database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF external database for specified IP address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="external"> + <properties> + <help>Show IPv4 OSPF external database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF external database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF external database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <leafNode name="max-age"> + <properties> + <help>Show IPv4 OSPF max-age database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <node name="network"> + <properties> + <help>Show IPv4 OSPF network database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF network database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF network database for given address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="network"> + <properties> + <help>Show IPv4 OSPF network database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF network database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF network database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <node name="nssa-external"> + <properties> + <help>Show IPv4 OSPF NSSA external database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="nssa-external"> + <properties> + <help>Show IPv4 OSPF NSSA external database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF NSSA external database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF NSSA external database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <node name="opaque-area"> + <properties> + <help>Show IPv4 OSPF opaque-area database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="opaque-area"> + <properties> + <help>Show IPv4 OSPF opaque-area database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-area database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF opaque-area database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <node name="opaque-as"> + <properties> + <help>Show IPv4 OSPF opaque-as database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="opaque-as"> + <properties> + <help>Show IPv4 OSPF opaque-as database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-as database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF opaque-as database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <node name="opaque-link"> + <properties> + <help>Show IPv4 OSPF opaque-link database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="opaque-link"> + <properties> + <help>Show IPv4 OSPF opaque-link database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF opaque-link database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF opaque-link database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <node name="router"> + <properties> + <help>Show IPv4 OSPF router database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF router database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF router database for specified IP address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="router"> + <properties> + <help>Show IPv4 OSPF router database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF router database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF router database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show IPv4 OSPF self-originate database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <node name="summary"> + <properties> + <help>Show summary of IPv4 OSPF database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="adv-router"> + <properties> + <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help> + </properties> + </node> + </children> + </node> + <tagNode name="summary"> + <properties> + <help>Show IPv4 OSPF summary database information of specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="adv-router"> + <properties> + <help>Show advertising router link states</help> + </properties> + </node> + <tagNode name="adv-router"> + <properties> + <help>Show IPv4 OSPF summary database of specified IP address for specified advertised router</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <leafNode name="self-originate"> + <properties> + <help>Show self-originate IPv4 OSPF summary database</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + </children> +</node> +<node name="interface"> + <properties> + <help>Show IPv4 OSPF interface information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</node> +<tagNode name="interface"> + <properties> + <help>Show IPv4 OSPF information for specified interface</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces.py</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<node name="neighbor"> + <properties> + <help>Show IPv4 OSPF neighbor information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <tagNode name="address"> + <properties> + <help>Show IPv4 OSPF neighbor information for specified IP address</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="detail"> + <properties> + <help>Show detailed IPv4 OSPF neighbor information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </node> + </children> +</node> +<tagNode name="neighbor"> + <properties> + <help>Show IPv4 OSPF neighbor information for specified IP address or interface</help> + <completionHelp> + <list><x.x.x.x></list> + <script>${vyos_completion_dir}/list_interfaces.py</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<leafNode name="route"> + <properties> + <help>Show IPv4 OSPF route information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i b/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i new file mode 100644 index 000000000..312ce2a4f --- /dev/null +++ b/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i @@ -0,0 +1,17 @@ +<!-- included start from ospfv3-adv-router-id-node-tag.xml.i --> +<node name="node.tag"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-adv-router.xml.i b/op-mode-definitions/include/ospfv3-adv-router.xml.i new file mode 100644 index 000000000..d17538d4d --- /dev/null +++ b/op-mode-definitions/include/ospfv3-adv-router.xml.i @@ -0,0 +1,16 @@ +<!-- included start from ospfv3-adv-router.xml.i --> +<tagNode name="adv-router"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + </children> +</tagNode> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-detail.xml.i b/op-mode-definitions/include/ospfv3-detail.xml.i new file mode 100644 index 000000000..76096fbc8 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-detail.xml.i @@ -0,0 +1,9 @@ +<!-- included start from ospfv3-detail.xml.i --> +<node name="detail"> + <properties> + <help>Show detailed information</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-dump.xml.i b/op-mode-definitions/include/ospfv3-dump.xml.i new file mode 100644 index 000000000..4271aec53 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-dump.xml.i @@ -0,0 +1,9 @@ +<!-- included start from ospfv3-dump.xml.i --> +<node name="dump"> + <properties> + <help>Show dump of LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-internal.xml.i b/op-mode-definitions/include/ospfv3-internal.xml.i new file mode 100644 index 000000000..8b45e86c1 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-internal.xml.i @@ -0,0 +1,9 @@ +<!-- included start from ospfv3-internal.xml.i --> +<node name="internal"> + <properties> + <help>Show internal LSA information</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i b/op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i new file mode 100644 index 000000000..24b549d28 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i @@ -0,0 +1,18 @@ +<!-- included start from ospfv3-linkstate-id-node-tag.xml.i --> +<node name="node.tag"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-linkstate-id.xml.i b/op-mode-definitions/include/ospfv3-linkstate-id.xml.i new file mode 100644 index 000000000..eab5916f1 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-linkstate-id.xml.i @@ -0,0 +1,15 @@ +<!-- included start from ospfv3-linkstate-id.xml.i --> +<tagNode name="linkstate-id"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> +</tagNode> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-self-originated.xml.i b/op-mode-definitions/include/ospfv3-self-originated.xml.i new file mode 100644 index 000000000..180bca6f6 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-self-originated.xml.i @@ -0,0 +1,14 @@ +<!-- included start from ospfv3-self-originated.xml.i --> +<node name="self-originated"> + <properties> + <help>Show Self-originated LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/vni-tagnode-all.xml.i b/op-mode-definitions/include/vni-tagnode-all.xml.i new file mode 100644 index 000000000..0fedb9371 --- /dev/null +++ b/op-mode-definitions/include/vni-tagnode-all.xml.i @@ -0,0 +1,11 @@ +<!-- included start from vni-tagnode-all.xml.i --> +<tagNode name="vni"> + <properties> + <help>VXLAN network identifier (VNI) number</help> + <completionHelp> + <list>1-16777215 all</list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<!-- included end --> diff --git a/op-mode-definitions/include/vni-tagnode.xml.i b/op-mode-definitions/include/vni-tagnode.xml.i new file mode 100644 index 000000000..22f2d33bd --- /dev/null +++ b/op-mode-definitions/include/vni-tagnode.xml.i @@ -0,0 +1,11 @@ +<!-- included start from vni-tagnode.xml.i --> +<tagNode name="vni"> + <properties> + <help>VXLAN network identifier (VNI) number</help> + <completionHelp> + <list>1-16777215</list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</tagNode> +<!-- included end --> diff --git a/op-mode-definitions/include/vtysh-generic-detail.xml.i b/op-mode-definitions/include/vtysh-generic-detail.xml.i new file mode 100644 index 000000000..d469f70c7 --- /dev/null +++ b/op-mode-definitions/include/vtysh-generic-detail.xml.i @@ -0,0 +1,8 @@ +<!-- included start from vtysh-generic-detail.xml.i --> +<leafNode name="detail"> + <properties> + <help>Detailed information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</leafNode> +<!-- included end --> diff --git a/op-mode-definitions/ipoe-server.xml b/op-mode-definitions/ipoe-server.xml.in index c20d3aa2a..89cefa08d 100644 --- a/op-mode-definitions/ipoe-server.xml +++ b/op-mode-definitions/ipoe-server.xml.in @@ -4,17 +4,17 @@ <children> <node name="ipoe-server"> <properties> - <help>Clear ipoe-server sessions or process</help> + <help>Clear IPoE server sessions or process</help> </properties> <children> <node name="session"> <properties> - <help>Clear ipoe-server session</help> + <help>Clear IPoE server session</help> </properties> <children> <tagNode name="username"> <properties> - <help>Clear ipoe-server session by username</help> + <help>Clear IPoE server session by username</help> <completionHelp> <script>${vyos_completion_dir}/list_ipoe.py --selector="username"</script> </completionHelp> @@ -23,7 +23,7 @@ </tagNode> <tagNode name="sid"> <properties> - <help>Clear ipoe-server session by Session ID</help> + <help>Clear IPoE server session by Session ID</help> <completionHelp> <script>${vyos_completion_dir}/list_ipoe.py --selector="sid"</script> </completionHelp> @@ -32,7 +32,7 @@ </tagNode> <tagNode name="interface"> <properties> - <help>Clear ipoe-server session by interface</help> + <help>Clear IPoE server session by interface</help> <completionHelp> <script>${vyos_completion_dir}/list_ipoe.py --selector="ifname"</script> </completionHelp> @@ -49,7 +49,7 @@ <children> <node name="ipoe-server"> <properties> - <help>show ipoe-server status</help> + <help>Show IPoE server status</help> </properties> <children> <leafNode name="sessions"> @@ -72,7 +72,7 @@ <children> <leafNode name="ipoe-server"> <properties> - <help>show ipoe-server status</help> + <help>Restart IPoE server process</help> </properties> <command>${vyos_op_scripts_dir}/ipoe-control.py --action="restart"</command> </leafNode> diff --git a/op-mode-definitions/ipv4-route.xml b/op-mode-definitions/ipv4-route.xml.in index 1bda3ac11..1bda3ac11 100644 --- a/op-mode-definitions/ipv4-route.xml +++ b/op-mode-definitions/ipv4-route.xml.in diff --git a/op-mode-definitions/ipv6-route.xml b/op-mode-definitions/ipv6-route.xml.in index fbf6489ba..7f188fdb2 100644 --- a/op-mode-definitions/ipv6-route.xml +++ b/op-mode-definitions/ipv6-route.xml.in @@ -21,47 +21,9 @@ <properties> <help>Show IPv6 Neighbor Discovery (ND) information</help> </properties> - <command>ip -f inet6 neigh list</command> + <command>${vyos_op_scripts_dir}/show_neigh.py --family inet6</command> </leafNode> - <node name="route"> - <properties> - <help>Show IPv6 routes</help> - </properties> - <children> - <node name="cache"> - <properties> - <help>Show kernel IPv6 route cache</help> - </properties> - <command>ip -s -f inet6 route list cache</command> - </node> - <tagNode name="cache"> - <properties> - <help>Show kernel IPv6 route cache for a given route</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>ip -s -f inet6 route list cache $5</command> - </tagNode> - <node name="forward"> - <properties> - <help>Show kernel IPv6 route table</help> - </properties> - <command>ip -f inet6 route list</command> - </node> - <tagNode name="forward"> - <properties> - <help>Show kernel IPv6 route table for a given route</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>ip -s -f inet6 route list $5</command> - </tagNode> - </children> - </node> - </children> </node> </children> diff --git a/op-mode-definitions/l2tp-server.xml b/op-mode-definitions/l2tp-server.xml.in index 3e96b9365..3e96b9365 100644 --- a/op-mode-definitions/l2tp-server.xml +++ b/op-mode-definitions/l2tp-server.xml.in diff --git a/op-mode-definitions/lldp.xml b/op-mode-definitions/lldp.xml.in index 297ccf1f4..297ccf1f4 100644 --- a/op-mode-definitions/lldp.xml +++ b/op-mode-definitions/lldp.xml.in diff --git a/op-mode-definitions/monitor-bandwidth-test.xml b/op-mode-definitions/monitor-bandwidth-test.xml.in index 5b36b1da5..5b36b1da5 100644 --- a/op-mode-definitions/monitor-bandwidth-test.xml +++ b/op-mode-definitions/monitor-bandwidth-test.xml.in diff --git a/op-mode-definitions/monitor-bandwidth.xml b/op-mode-definitions/monitor-bandwidth.xml.in index 9af0a9e70..9af0a9e70 100644 --- a/op-mode-definitions/monitor-bandwidth.xml +++ b/op-mode-definitions/monitor-bandwidth.xml.in diff --git a/op-mode-definitions/monitor-log.xml b/op-mode-definitions/monitor-log.xml.in index 99efe5306..99efe5306 100644 --- a/op-mode-definitions/monitor-log.xml +++ b/op-mode-definitions/monitor-log.xml.in diff --git a/op-mode-definitions/monitor-ndp.xml b/op-mode-definitions/monitor-ndp.xml.in index 1ac6ce39b..1ac6ce39b 100644 --- a/op-mode-definitions/monitor-ndp.xml +++ b/op-mode-definitions/monitor-ndp.xml.in diff --git a/op-mode-definitions/monitor-protocol.xml.in b/op-mode-definitions/monitor-protocol.xml.in new file mode 100644 index 000000000..6a6bd50f3 --- /dev/null +++ b/op-mode-definitions/monitor-protocol.xml.in @@ -0,0 +1,1542 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="monitor"> + <children> + <node name="protocol"> + <properties> + <help>Monitor routing protocols</help> + </properties> + <children> + <node name="bgp"> + <properties> + <help>Monitor the Border Gateway Protocol (BGP)</help> + </properties> + <children> + #include <include/monitor-background.xml.i> + <node name="disable"> + <properties> + <help>Disable Border Gateway Protocol (BGP) debugging</help> + </properties> + <children> + <node name="all"> + <properties> + <help>Disable all BGP debugging</help> + </properties> + <command>vtysh -c "no debug bgp"</command> + </node> + <node name="allow-martians"> + <properties> + <help>Disable BGP martians next hops debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="as4"> + <properties> + <help>Disable BGP allow AS4 actions debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="bestpath"> + <properties> + <help>Disable BGP allow best path debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <tagNode name="bestpath"> + <properties> + <help>Disable BGP bestpath IPv4 IPv6</help> + <completionHelp> + <list><x.x.x.x/x> <h:h:h:h:h:h:h:h/h></list> + </completionHelp> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </tagNode> + <node name="flowspec"> + <properties> + <help>Disable BGP allow flowspec debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="keepalives"> + <properties> + <help>Disable BGP keepalives debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="labelpool"> + <properties> + <help>Disable BGP label pool debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="neighbor-events"> + <properties> + <help>Disable BGP Neighbor events debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="nht"> + <properties> + <help>Disable BGP next hop tracking debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="pbr"> + <properties> + <help>Disable BGP policy based routing debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="rib"> + <properties> + <help>Disable BGP rib debugging</help> + </properties> + <command>vtysh -c "no debug bgp zebra"</command> + </node> + <node name="update-groups"> + <properties> + <help>Disable BGP update groups debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="updates"> + <properties> + <help>Disable BGP updates debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="vnc"> + <properties> + <help>Disable BGP VNC debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + <children> + <node name="import-bi-attach"> + <properties> + <help>Disable BGP vnc import BI attachment debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="import-del-remote"> + <properties> + <help>Disable BGP vnc import/delete remote routes debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="rfapi-query"> + <properties> + <help>Disable BGP vnc rfapi query debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + <node name="verbose"> + <properties> + <help>Disable BGP vnc verbose logging debugging</help> + </properties> + <command>vtysh -c "no debug bgp ${@:5}"</command> + </node> + </children> + </node> + </children> + </node> + <node name="enable"> + <properties> + <help>Enable Border Gateway Protocol (BGP) debugging</help> + </properties> + <children> + <node name="allow-martians"> + <properties> + <help>Enable BGP martians next hops debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="as4"> + <properties> + <help>Enable BGP allow AS4 actions debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="bestpath"> + <properties> + <help>Enable BGP allow best path debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <tagNode name="bestpath"> + <properties> + <help>Debug bestpath IPv4 IPv6</help> + <completionHelp> + <list><x.x.x.x/x> <h:h:h:h:h:h:h:h/h></list> + </completionHelp> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </tagNode> + <node name="flowspec"> + <properties> + <help>Enable BGP allow flowspec debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="keepalives"> + <properties> + <help>Enable BGP keepalives debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="labelpool"> + <properties> + <help>Enable BGP label pool debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="neighbor-events"> + <properties> + <help>Enable BGP Neighbor events debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="nht"> + <properties> + <help>Enable BGP next hop tracking debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="pbr"> + <properties> + <help>Enable BGP policy based routing debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="rib"> + <properties> + <help>Enable BGP rib debugging</help> + </properties> + <command>vtysh -c "debug bgp zebra"</command> + </node> + <node name="update-groups"> + <properties> + <help>Enable BGP update groups debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="updates"> + <properties> + <help>Enable BGP updates debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="vnc"> + <properties> + <help>Enable BGP VNC debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + <children> + <node name="import-bi-attach"> + <properties> + <help>Enable BGP vnc import BI attachment debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="import-del-remote"> + <properties> + <help>Enable BGP vnc import/delete remote routes debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="rfapi-query"> + <properties> + <help>Enable BGP vnc rfapi query debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + <node name="verbose"> + <properties> + <help>Enable BGP vnc verbose logging debugging</help> + </properties> + <command>vtysh -c "debug bgp ${@:5}"</command> + </node> + </children> + </node> + </children> + </node> + </children> + </node> + <node name="ospf"> + <properties> + <help>Monitor the Open Shortest Path First (OSPF) protocol</help> + </properties> + <children> + #include <include/monitor-background.xml.i> + + + <node name="disable"> + <children> + <node name="event"> + <properties> + <help>Disable OSPF debugging</help> + </properties> + <command>vtysh -c "no debug ospf"</command> + </node> + <node name="event"> + <properties> + <help>Disable OSPF event debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="ism"> + <properties> + <help>Disable OSPF ism debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + <node name="events"> + <properties> + <help>Disable OSPF ism events debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="status"> + <properties> + <help>Disable OSPF ism status debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="timers"> + <properties> + <help>Disable OSPF ism timers debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + </children> + </node> + <node name="lsa"> + <properties> + <help>Disable OSPF lsa debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + <node name="flooding"> + <properties> + <help>Disable OSPF lsa flooding debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="generate"> + <properties> + <help>Disable OSPF lsa generate debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="install"> + <properties> + <help>Disable OSPF lsa install debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="refresh"> + <properties> + <help>Disable OSPF lsa refresh debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + </children> + </node> + <node name="nsm"> + <properties> + <help>Disable OSPF nsm debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + <node name="events"> + <properties> + <help>Disable OSPF nsm events debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="status"> + <properties> + <help>Disable OSPF nsm status debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="timers"> + <properties> + <help>Disable OSPF nsm timers debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + </children> + </node> + <node name="nssa"> + <properties> + <help>Disable OSPF nssa debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Disable OSPF packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + <node name="all"> + <properties> + <help>Disable OSPF all packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + #include <include/monitor-no-ospf-packet-detail.xml.i> + </children> + </node> + <node name="dd"> + <properties> + <help>Disable OSPF dd packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + #include <include/monitor-no-ospf-packet-detail.xml.i> + </children> + </node> + <node name="hello"> + <properties> + <help>Disable OSPF hello packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + #include <include/monitor-no-ospf-packet-detail.xml.i> + </children> + </node> + <node name="ls-ack"> + <properties> + <help>Disable OSPF ls-ack packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + #include <include/monitor-no-ospf-packet-detail.xml.i> + </children> + </node> + <node name="ls-request"> + <properties> + <help>Disable OSPF ls-request packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + #include <include/monitor-no-ospf-packet-detail.xml.i> + </children> + </node> + <node name="ls-update"> + <properties> + <help>Disable OSPF ls-update packet debugging</help> + </properties> + <command>vtysh -c "no debug ospf ${@:5}"</command> + <children> + #include <include/monitor-no-ospf-packet-detail.xml.i> + </children> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Disable OSPF rib debugging</help> + </properties> + <command>vtysh -c "no debug ospf zebra"</command> + <children> + <node name="interface"> + <properties> + <help>Disable OSPF rib interface debugging</help> + </properties> + <command>vtysh -c "no debug ospf zebra interface"</command> + </node> + <node name="redistribute"> + <properties> + <help>Disable OSPF rib redistribute debugging</help> + </properties> + <command>vtysh -c "no debug ospf zebra redistribute"</command> + </node> + </children> + </node> + </children> + </node> + <node name="enable"> + <children> + <node name="event"> + <properties> + <help>Enable OSPF event debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="ism"> + <properties> + <help>Enable OSPF ism debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + <node name="events"> + <properties> + <help>Enable OSPF ism events debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="status"> + <properties> + <help>Enable OSPF ism status debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="timers"> + <properties> + <help>Enable OSPF ism timers debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + </children> + </node> + <node name="lsa"> + <properties> + <help>Enable OSPF lsa debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + <node name="flooding"> + <properties> + <help>Enable OSPF lsa flooding debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="generate"> + <properties> + <help>Enable OSPF lsa generate debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="install"> + <properties> + <help>Enable OSPF lsa install debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="refresh"> + <properties> + <help>Enable OSPF lsa refresh debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + </children> + </node> + <node name="nsm"> + <properties> + <help>Enable OSPF nsm debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + <node name="events"> + <properties> + <help>Enable OSPF nsm events debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="status"> + <properties> + <help>Enable OSPF nsm status debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="timers"> + <properties> + <help>Enable OSPF nsm timers debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + </children> + </node> + <node name="nssa"> + <properties> + <help>Enable OSPF nssa debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Enable OSPF packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + <node name="all"> + <properties> + <help>Enable OSPF all packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + #include <include/monitor-ospf-packet-detail.xml.i> + </children> + </node> + <node name="dd"> + <properties> + <help>Enable OSPF dd packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + #include <include/monitor-ospf-packet-detail.xml.i> + </children> + </node> + <node name="hello"> + <properties> + <help>Enable OSPF hello packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + #include <include/monitor-ospf-packet-detail.xml.i> + </children> + </node> + <node name="ls-ack"> + <properties> + <help>Enable OSPF ls-ack packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + #include <include/monitor-ospf-packet-detail.xml.i> + </children> + </node> + <node name="ls-request"> + <properties> + <help>Enable OSPF ls-request packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + #include <include/monitor-ospf-packet-detail.xml.i> + </children> + </node> + <node name="ls-update"> + <properties> + <help>Enable OSPF ls-update packet debugging</help> + </properties> + <command>vtysh -c "debug ospf ${@:5}"</command> + <children> + #include <include/monitor-ospf-packet-detail.xml.i> + </children> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Enable OSPF rib debugging</help> + </properties> + <command>vtysh -c "debug ospf zebra"</command> + <children> + <node name="interface"> + <properties> + <help>Enable OSPF rib interface debugging</help> + </properties> + <command>vtysh -c "debug ospf zebra interface"</command> + </node> + <node name="redistribute"> + <properties> + <help>Enable OSPF rib redistribute debugging</help> + </properties> + <command>vtysh -c "debug ospf zebra redistribute"</command> + </node> + </children> + </node> + </children> + </node> + </children> + </node> + <node name="ospfv3"> + <properties> + <help>Monitor the IPv6 Open Shortest Path First (OSPFv3) protocol</help> + </properties> + <children> + <node name="background"> + <properties> + <help>Monitor in background</help> + </properties> + <children> + <node name="start"> + <properties> + <help>Start background monitoring</help> + </properties> + <command>${vyatta_bindir}/vyatta-monitor-background OSPFv3 ospf6</command> + </node> + <node name="stop"> + <properties> + <help>Stop background monitoring</help> + </properties> + <command>${vyatta_bindir}/vyatta-monitor-background-stop OSPFv3</command> + </node> + </children> + </node> + <node name="disable"> + <properties> + <help>Disable IPv6 Open Shortest Path First (OSPFv3) protocol debugging</help> + </properties> + <children> + <node name="abr"> + <properties> + <help>Disable all OSPFv3 debugging</help> + </properties> + <command>vtysh -c "no debug ospf6"</command> + </node> + <node name="abr"> + <properties> + <help>Disable OSPFv3 ABR debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="asbr"> + <properties> + <help>Disable OSPFv3 ASBR debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="border-routers"> + <properties> + <help>Disable OSPFv3 border router debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + <children> + <node name="area-id"> + <properties> + <help>Disable debug border routers in specific Area</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="router-id"> + <properties> + <help>Disable debug specific border router</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="flooding"> + <properties> + <help>Disable OSPFv3 flooding debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="interface"> + <properties> + <help>Disable OSPFv3 Interface debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="lsa"> + <properties> + <help>Disable OSPFv3 Link State Advertisments debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + <children> + <node name="as-external"> + <properties> + <help>Display As-External LSAs</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="inter-prefix"> + <properties> + <help>Display Inter-Area-Prefix LSAs</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="inter-router"> + <properties> + <help>Display Inter-Router LSAs</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="intra-prefix"> + <properties> + <help>Display Intra-Area-Prefix LSAs</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="link"> + <properties> + <help>Display Link LSAs</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="network"> + <properties> + <help>Display Network LSAs</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="router"> + <properties> + <help>Display Router LSAs</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="unknown"> + <properties> + <help>Display LSAs of unknown origin</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="message"> + <properties> + <help>Disable OSPFv3 message debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + <children> + <node name="all"> + <properties> + <help>Debug All message</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="dbdesc"> + <properties> + <help>Debug Database Description message</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="hello"> + <properties> + <help>Debug Hello message</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="lsack"> + <properties> + <help>Debug Link State Acknowledgement message</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="lsreq"> + <properties> + <help>Debug Link State Request message</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="lsupdate"> + <properties> + <help>Debug Link State Update message</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="unknown"> + <properties> + <help>Debug Unknown message</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="neighbor"> + <properties> + <help>Disable OSPFv3 Neighbor debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + <children> + <node name="event"> + <properties> + <help>Debug OSPFv3 Neighbor Event</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="state"> + <properties> + <help>Debug OSPFv3 Neighbor State Change</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Disable OSPFv3 connection to RIB debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + <children> + <node name="recv"> + <properties> + <help>Debug receiving zebra</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Debug sending zebra</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="route"> + <properties> + <help>Disable OSPFv3 route table calculation debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + <children> + <node name="inter-area"> + <properties> + <help>Debug inter-area route calculation</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="intra-area"> + <properties> + <help>Debug intra-area route calculation</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="memory"> + <properties> + <help>Debug route memory use</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="table"> + <properties> + <help>Debug route table calculation</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="spf"> + <properties> + <help>Disable OSPFv3 SPF calculation debugging</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + <children> + <node name="database"> + <properties> + <help>Log number of LSAs at SPF Calculation time</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="process"> + <properties> + <help>Debug Detailed SPF Process</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + <node name="time"> + <properties> + <help>Measure time taken by SPF Calculation</help> + </properties> + <command>vtysh -c "no debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + </children> + </node> + <node name="enable"> + <properties> + <help>Enable IPv6 Open Shortest Path First (OSPFv3) protocol debugging</help> + </properties> + <children> + <node name="abr"> + <properties> + <help>Enable OSPFv3 ABR debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="asbr"> + <properties> + <help>Enable OSPFv3 ASBR debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="border-routers"> + <properties> + <help>Enable OSPFv3 border router debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + <children> + <node name="area-id"> + <properties> + <help>Debug border routers in specific Area</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="router-id"> + <properties> + <help>Debug specific border router</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="flooding"> + <properties> + <help>Enable OSPFv3 flooding debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="interface"> + <properties> + <help>Enable OSPFv3 Interface debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="lsa"> + <properties> + <help>Enable OSPFv3 Link State Advertisments debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + <children> + <node name="as-external"> + <properties> + <help>Display As-External LSAs</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="inter-prefix"> + <properties> + <help>Display Inter-Area-Prefix LSAs</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="inter-router"> + <properties> + <help>Display Inter-Router LSAs</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="intra-prefix"> + <properties> + <help>Display Intra-Area-Prefix LSAs</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="link"> + <properties> + <help>Display Link LSAs</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="network"> + <properties> + <help>Display Network LSAs</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="router"> + <properties> + <help>Display Router LSAs</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="unknown"> + <properties> + <help>Display LSAs of unknown origin</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="message"> + <properties> + <help>Enable OSPFv3 message debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + <children> + <node name="all"> + <properties> + <help>Debug All message</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="dbdesc"> + <properties> + <help>Debug Database Description message</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="hello"> + <properties> + <help>Debug Hello message</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="lsack"> + <properties> + <help>Debug Link State Acknowledgement message</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="lsreq"> + <properties> + <help>Debug Link State Request message</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="lsupdate"> + <properties> + <help>Debug Link State Update message</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="unknown"> + <properties> + <help>Debug Unknown message</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="neighbor"> + <properties> + <help>Enable OSPFv3 Neighbor debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + <children> + <node name="event"> + <properties> + <help>Debug OSPFv3 Neighbor Event</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="state"> + <properties> + <help>Debug OSPFv3 Neighbor State Change</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Enable OSPFv3 connection to RIB debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + <children> + <node name="recv"> + <properties> + <help>Debug receiving zebra</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Debug sending zebra</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="route"> + <properties> + <help>Enable OSPFv3 route table calculation debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + <children> + <node name="inter-area"> + <properties> + <help>Debug inter-area route calculation</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="intra-area"> + <properties> + <help>Debug intra-area route calculation</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="memory"> + <properties> + <help>Debug route memory use</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="table"> + <properties> + <help>Debug route table calculation</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + <node name="spf"> + <properties> + <help>Enable OSPFv3 SPF calculation debugging</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + <children> + <node name="database"> + <properties> + <help>Log number of LSAs at SPF Calculation time</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="process"> + <properties> + <help>Debug Detailed SPF Process</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + <node name="time"> + <properties> + <help>Measure time taken by SPF Calculation</help> + </properties> + <command>vtysh -c "debug ospf6 ${@:5}"</command> + </node> + </children> + </node> + </children> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Monitor the Routing Information Base (RIB)</help> + </properties> + <children> + <node name="background"> + <properties> + <help>Monitor in background</help> + </properties> + <children> + <node name="start"> + <properties> + <help>Start background monitoring</help> + </properties> + <command>${vyatta_bindir}/vyatta-monitor-background RIB zebra</command> + </node> + <node name="stop"> + <properties> + <help>Stop background monitoring</help> + </properties> + <command>${vyatta_bindir}/vyatta-monitor-background-stop RIB</command> + </node> + </children> + </node> + <node name="disable"> + <properties> + <help>Disable Route Information Base (RIB) debugging</help> + </properties> + <children> + <node name="events"> + <properties> + <help>Disable RIB events debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + <node name="kernel"> + <properties> + <help>Disable RIB kernel debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Disable RIB packet debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + <children> + <node name="detail"> + <properties> + <help>Disable detailed debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + <node name="recv"> + <properties> + <help>Disable receive packet debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Disable send packet debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + </children> + </node> + <node name="nexthop"> + <properties> + <help>Disable RIB nexthop debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + <node name="mpls"> + <properties> + <help>Disable RIP MPLS LSP debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + <node name="rib"> + <properties> + <help>Disable RIB debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + <children> + <node name="detailed"> + <properties> + <help>Disable detailed debugging</help> + </properties> + <command>vtysh -c "no debug zebra ${@:5}"</command> + </node> + </children> + </node> + </children> + </node> + <node name="enable"> + <properties> + <help>Enable Route Information Base (RIB) debugging</help> + </properties> + <children> + <node name="events"> + <properties> + <help>Enable RIB events debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + <node name="kernel"> + <properties> + <help>Enable RIB kernel debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Enable RIB packet debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + <children> + <node name="detail"> + <properties> + <help>Enable detailed debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + <node name="recv"> + <properties> + <help>Enable receive packet debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Enable send packet debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + </children> + </node> + <node name="nexthop"> + <properties> + <help>Enable RIB nexthop debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + <node name="mpls"> + <properties> + <help>Enable RIP MPLS LSP debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + <node name="rib"> + <properties> + <help>Enable RIB debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + <children> + <node name="detailed"> + <properties> + <help>Enable detailed debugging</help> + </properties> + <command>vtysh -c "debug zebra ${@:5}"</command> + </node> + </children> + </node> + </children> + </node> + </children> + </node> + <node name="rip"> + <properties> + <help>Monitor the Routing Information Protocol (RIP)</help> + </properties> + <children> + #include <include/monitor-background.xml.i> + <node name="disable"> + <properties> + <help>Disable Routing Information Protocol (RIP) debugging</help> + </properties> + <children> + <node name="all"> + <properties> + <help>Disable RIP debugging</help> + </properties> + <command>vtysh -c "no debug rip"</command> + </node> + <node name="events"> + <properties> + <help>Disable RIP events debugging</help> + </properties> + <command>vtysh -c "no debug rip ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Disable RIP packet debugging</help> + </properties> + <command>vtysh -c "no debug rip ${@:5}"</command> + <children> + <node name="recv"> + <properties> + <help>Disable receive packet debugging</help> + </properties> + <command>vtysh -c "no debug rip ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Disable send packet debugging</help> + </properties> + <command>vtysh -c "no debug rip ${@:5}"</command> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Disable RIB debugging</help> + </properties> + <command>vtysh -c "no debug rip zebra"</command> + </node> + </children> + </node> + <node name="enable"> + <properties> + <help>Enable Routing Information Protocol (RIP) debugging</help> + </properties> + <children> + <node name="events"> + <properties> + <help>Enable RIP events debugging</help> + </properties> + <command>vtysh -c "debug rip ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Enable RIP packet debugging</help> + </properties> + <command>vtysh -c "debug rip ${@:5}"</command> + <children> + <node name="recv"> + <properties> + <help>Enable receive packet debugging</help> + </properties> + <command>vtysh -c "debug rip ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Enable send packet debugging</help> + </properties> + <command>vtysh -c "debug rip ${@:5}"</command> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Enable RIB debugging</help> + </properties> + <command>vtysh -c "debug rip zebra"</command> + </node> + </children> + </node> + </children> + </node> + <node name="ripng"> + <properties> + <help>Monitor the Routing Information Protocol Next Generation (RIPng) protocol</help> + </properties> + <children> + #include <include/monitor-background.xml.i> + <node name="disable"> + <properties> + <help>Disable Routing Information Protocol Next Generation (RIPNG) debugging</help> + </properties> + <children> + <node name="all"> + <properties> + <help>Disable RIPNG debugging</help> + </properties> + <command>vtysh -c "no debug ripng"</command> + </node> + <node name="events"> + <properties> + <help>Disable RIPNG events debugging</help> + </properties> + <command>vtysh -c "no debug ripng ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Disable RIPNG packet debugging</help> + </properties> + <command>vtysh -c "no debug ripng ${@:5}"</command> + <children> + <node name="recv"> + <properties> + <help>Disable receive packet debugging</help> + </properties> + <command>vtysh -c "no debug ripng ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Disable send packet debugging</help> + </properties> + <command>vtysh -c "no debug ripng ${@:5}"</command> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Disable RIB debugging</help> + </properties> + <command>vtysh -c "no debug ripng zebra"</command> + </node> + </children> + </node> + <node name="enable"> + <properties> + <help>Enable Routing Information Protocol Next Generation (RIPNG) debugging</help> + </properties> + <children> + <node name="events"> + <properties> + <help>Enable RIPNG events debugging</help> + </properties> + <command>vtysh -c "debug ripng ${@:5}"</command> + </node> + <node name="packet"> + <properties> + <help>Enable RIPNG packet debugging</help> + </properties> + <command>vtysh -c "debug ripng ${@:5}"</command> + <children> + <node name="recv"> + <properties> + <help>Enable receive packet debugging</help> + </properties> + <command>vtysh -c "debug ripng ${@:5}"</command> + </node> + <node name="send"> + <properties> + <help>Enable send packet debugging</help> + </properties> + <command>vtysh -c "debug ripng ${@:5}"</command> + </node> + </children> + </node> + <node name="rib"> + <properties> + <help>Enable RIB debugging</help> + </properties> + <command>vtysh -c "debug ripng zebra"</command> + </node> + </children> + </node> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/nat.xml b/op-mode-definitions/nat.xml.in index f6c0fa748..084e2e7e3 100644 --- a/op-mode-definitions/nat.xml +++ b/op-mode-definitions/nat.xml.in @@ -4,19 +4,19 @@ <children> <node name="nat"> <properties> - <help>Show Network Address Translation (NAT) information</help> + <help>Show IPv4 to IPv4 Network Address Translation (NAT) information</help> </properties> <children> <node name="source"> <properties> - <help>Show source Network Address Translation (NAT) information</help> + <help>Show source IPv4 to IPv4 Network Address Translation (NAT) information</help> </properties> <children> <node name="rules"> <properties> <help>Show configured source NAT rules</help> </properties> - <command>echo To be migrated to Python - https://phabricator.vyos.net/T2459</command> + <command>${vyos_op_scripts_dir}/show_nat_rules.py --source</command> </node> <node name="statistics"> <properties> @@ -51,14 +51,14 @@ </node> <node name="destination"> <properties> - <help>Show destination Network Address Translation (NAT) information</help> + <help>Show destination IPv4 to IPv4 Network Address Translation (NAT) information</help> </properties> <children> <node name="rules"> <properties> <help>Show configured destination NAT rules</help> </properties> - <command>echo To be migrated to Python - https://phabricator.vyos.net/T2459</command> + <command>${vyos_op_scripts_dir}/show_nat_rules.py --destination</command> </node> <node name="statistics"> <properties> diff --git a/op-mode-definitions/nat66.xml.in b/op-mode-definitions/nat66.xml.in new file mode 100644 index 000000000..1ec46eb11 --- /dev/null +++ b/op-mode-definitions/nat66.xml.in @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="nat66"> + <properties> + <help>Show IPv6 to IPv6 Network Address Translation (NAT66) information</help> + </properties> + <children> + <node name="source"> + <properties> + <help>Show source IPv6 to IPv6 Network Address Translation (NAT66) information</help> + </properties> + <children> + <node name="rules"> + <properties> + <help>Show configured source NAT66 rules</help> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_rules.py --source</command> + </node> + <node name="statistics"> + <properties> + <help>Show statistics for configured source NAT66 rules</help> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_statistics.py --source</command> + </node> + <node name="translations"> + <properties> + <help>Show active source NAT66 translations</help> + </properties> + <children> + <tagNode name="address"> + <properties> + <help>Show active source NAT66 translations for an IPv6 address</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=source --verbose --ipaddr="$6"</command> + </tagNode> + <node name="detail"> + <properties> + <help>Show active source NAT66 translations detail</help> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=source --verbose</command> + </node> + </children> + <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=source</command> + </node> + </children> + </node> + <node name="destination"> + <properties> + <help>Show destination IPv6 to IPv6 Network Address Translation (NAT66) information</help> + </properties> + <children> + <node name="rules"> + <properties> + <help>Show configured destination NAT66 rules</help> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_rules.py --destination</command> + </node> + <node name="statistics"> + <properties> + <help>Show statistics for configured destination NAT66 rules</help> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_statistics.py --destination</command> + </node> + <node name="translations"> + <properties> + <help>Show active destination NAT66 translations</help> + </properties> + <children> + <tagNode name="address"> + <properties> + <help>Show active NAT66 destination translations for an IPv6 address</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=destination --verbose --ipaddr="$6"</command> + </tagNode> + <node name="detail"> + <properties> + <help>Show active destination NAT66 translations detail</help> + </properties> + <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=destination --verbose</command> + </node> + </children> + <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=destination</command> + </node> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/openconnect.xml b/op-mode-definitions/openconnect.xml.in index 9b82b114e..36f23239e 100644 --- a/op-mode-definitions/openconnect.xml +++ b/op-mode-definitions/openconnect.xml.in @@ -4,12 +4,12 @@ <children> <node name="openconnect-server"> <properties> - <help>show openconnect-server information</help> + <help>Show OpenConnect server information</help> </properties> <children> <leafNode name="sessions"> <properties> - <help>Show active openconnect server sessions</help> + <help>Show active OpenConnect server sessions</help> </properties> <command>${vyos_op_scripts_dir}/openconnect-control.py --action="show_sessions"</command> </leafNode> diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml.in index b9cb06dca..e9420904a 100644 --- a/op-mode-definitions/openvpn.xml +++ b/op-mode-definitions/openvpn.xml.in @@ -19,7 +19,6 @@ key_path=$4 full_path= - # Prepend /config/auth if the path is not absolute if echo $key_path | egrep -ve '^/.*' > /dev/null; then full_path=/config/auth/$key_path else diff --git a/op-mode-definitions/ping.xml b/op-mode-definitions/ping.xml.in index 4c25a59ab..4c25a59ab 100644 --- a/op-mode-definitions/ping.xml +++ b/op-mode-definitions/ping.xml.in diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml.in index b4163bcb9..b4163bcb9 100644 --- a/op-mode-definitions/poweroff.xml +++ b/op-mode-definitions/poweroff.xml.in diff --git a/op-mode-definitions/pppoe-server.xml b/op-mode-definitions/pppoe-server.xml.in index 5ac9d9497..6efdc5a48 100644 --- a/op-mode-definitions/pppoe-server.xml +++ b/op-mode-definitions/pppoe-server.xml.in @@ -4,7 +4,7 @@ <children> <node name="pppoe-server"> <properties> - <help>Show pppoe-server status</help> + <help>Show PPPoE server status</help> </properties> <children> <leafNode name="sessions"> @@ -21,7 +21,7 @@ </leafNode> <leafNode name="interfaces"> <properties> - <help>Show interfaces where pppoe-server listens on</help> + <help>Show interfaces where PPPoE server listens on</help> </properties> <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="pppoe interface show"</command> </leafNode> @@ -33,7 +33,7 @@ <children> <leafNode name="pppoe-server"> <properties> - <help>Restarts pppoe-server</help> + <help>Restart PPPoE server process</help> </properties> <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="restart"</command> </leafNode> @@ -51,13 +51,13 @@ <children> <leafNode name="all"> <properties> - <help>Terminate all pppoe-server users</help> + <help>Terminate all PPPoE server users</help> </properties> <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="terminate all"</command> </leafNode> <tagNode name="interface"> <properties> - <help>Terminate a ppp interface</help> + <help>Terminate a PPP interface</help> </properties> <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="terminate if $4"</command> </tagNode> @@ -85,7 +85,7 @@ <children> <leafNode name="enable"> <properties> - <help>Deny new connections and stop to serve pppoe after disconnect last session</help> + <help>Deny new connections and stop serving PPPoE after disconnecting the last session</help> </properties> <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="shutdown soft"</command> </leafNode> diff --git a/op-mode-definitions/pptp-server.xml b/op-mode-definitions/pptp-server.xml.in index 59be68611..59be68611 100644 --- a/op-mode-definitions/pptp-server.xml +++ b/op-mode-definitions/pptp-server.xml.in diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml.in index 2c8daec5d..2c8daec5d 100644 --- a/op-mode-definitions/reboot.xml +++ b/op-mode-definitions/reboot.xml.in diff --git a/op-mode-definitions/reset-conntrack.xml b/op-mode-definitions/reset-conntrack.xml.in index 827ba4af4..827ba4af4 100644 --- a/op-mode-definitions/reset-conntrack.xml +++ b/op-mode-definitions/reset-conntrack.xml.in diff --git a/op-mode-definitions/reset-ip-bgp.xml b/op-mode-definitions/reset-ip-bgp.xml.in index 931a2a9bc..931a2a9bc 100644 --- a/op-mode-definitions/reset-ip-bgp.xml +++ b/op-mode-definitions/reset-ip-bgp.xml.in diff --git a/op-mode-definitions/reset-ip-igmp.xml b/op-mode-definitions/reset-ip-igmp.xml.in index 143553d33..e79c33da8 100644 --- a/op-mode-definitions/reset-ip-igmp.xml +++ b/op-mode-definitions/reset-ip-igmp.xml.in @@ -13,7 +13,7 @@ <properties> <help>Reset IGMP interfaces</help> </properties> - <command>/usr/bin/vtysh -c "clear ip igmp interfaces"</command> + <command>vtysh -c "clear ip igmp interfaces"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/reset-ip-multicast.xml b/op-mode-definitions/reset-ip-multicast.xml.in index d610add16..6cca07850 100644 --- a/op-mode-definitions/reset-ip-multicast.xml +++ b/op-mode-definitions/reset-ip-multicast.xml.in @@ -13,7 +13,7 @@ <properties> <help>Clear multicast routing table</help> </properties> - <command>/usr/bin/vtysh -c "clear ip mroute"</command> + <command>vtysh -c "clear ip mroute"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/reset-ipv6-bgp.xml b/op-mode-definitions/reset-ipv6-bgp.xml.in index 3c4275331..3c4275331 100644 --- a/op-mode-definitions/reset-ipv6-bgp.xml +++ b/op-mode-definitions/reset-ipv6-bgp.xml.in diff --git a/op-mode-definitions/reset-mpls.xml b/op-mode-definitions/reset-mpls.xml.in index 4e5d37d5b..829ed41ab 100644 --- a/op-mode-definitions/reset-mpls.xml +++ b/op-mode-definitions/reset-mpls.xml.in @@ -17,10 +17,10 @@ <help>Reset MPLS LDP neighbor/session</help> <completionHelp> <list><x.x.x.x> <h:h:h:h:h:h:h:h></list> - <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> + <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "clear mpls ldp neighbor $5"</command> + <command>vtysh -c "clear mpls ldp neighbor $5"</command> </tagNode> </children> </node> diff --git a/op-mode-definitions/reset-vpn.xml b/op-mode-definitions/reset-vpn.xml.in index ae553c272..71dbb4ed9 100644 --- a/op-mode-definitions/reset-vpn.xml +++ b/op-mode-definitions/reset-vpn.xml.in @@ -17,31 +17,31 @@ <children> <node name="all"> <properties> - <help>Terminate all user's current remote access VPN session(s)</help> + <help>Terminate all users current remote access VPN session(s)</help> </properties> <children> <node name="protocol"> <properties> - <help>Terminate specified user's current remote access VPN session(s) with specified protocol</help> + <help>Terminate specified users current remote access VPN session(s) with specified protocol</help> </properties> <children> <leafNode name="l2tp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with L2TP protocol</help> + <help>Terminate all users current remote access VPN session(s) with L2TP protocol</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="l2tp"</command> + <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="l2tp"</command> </leafNode> <leafNode name="pptp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with PPTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with PPTP protocol</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="pptp"</command> + <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="pptp"</command> </leafNode> <leafNode name="sstp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with SSTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with SSTP protocol</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="sstp"</command> + <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="sstp"</command> </leafNode> </children> </node> @@ -56,29 +56,29 @@ </tagNode> <tagNode name="user"> <properties> - <help>Terminate specified user's current remote access VPN session(s)</help> + <help>Terminate specified users current remote access VPN session(s)</help> </properties> <children> <node name="protocol"> <properties> - <help>Terminate specified user's current remote access VPN session(s) with specified protocol</help> + <help>Terminate specified users current remote access VPN session(s) with specified protocol</help> </properties> <children> <leafNode name="l2tp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with L2TP protocol</help> + <help>Terminate all users current remote access VPN session(s) with L2TP protocol</help> </properties> <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="$5" --protocol="l2tp"</command> </leafNode> <leafNode name="pptp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with PPTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with PPTP protocol</help> </properties> <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="$5" --protocol="pptp"</command> </leafNode> <leafNode name="sstp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with SSTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with SSTP protocol</help> </properties> <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="$5" --protocol="sstp"</command> </leafNode> diff --git a/op-mode-definitions/restart-frr.xml b/op-mode-definitions/restart-frr.xml.in index 96ad1a650..96ad1a650 100644 --- a/op-mode-definitions/restart-frr.xml +++ b/op-mode-definitions/restart-frr.xml.in diff --git a/op-mode-definitions/restart-snmp.xml.in b/op-mode-definitions/restart-snmp.xml.in new file mode 100644 index 000000000..7de27df64 --- /dev/null +++ b/op-mode-definitions/restart-snmp.xml.in @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="restart"> + <children> + <node name="snmp"> + <properties> + <help>Restart SNMP service</help> + </properties> + <command>if cli-shell-api existsActive service snmp; then sudo systemctl restart snmpd.service; else echo "Service SNMP not configured"; fi</command> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/restart-ssh.xml.in b/op-mode-definitions/restart-ssh.xml.in new file mode 100644 index 000000000..6504cc18a --- /dev/null +++ b/op-mode-definitions/restart-ssh.xml.in @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="restart"> + <children> + <node name="ssh"> + <properties> + <help>Restart SSH service</help> + </properties> + <command>if cli-shell-api existsActive service ssh; then sudo systemctl restart ssh.service; else echo "Service SSH not configured"; fi</command> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/restart.xml b/op-mode-definitions/restart.xml.in index c74ec9013..c74ec9013 100644 --- a/op-mode-definitions/restart.xml +++ b/op-mode-definitions/restart.xml.in diff --git a/op-mode-definitions/show-acceleration.xml b/op-mode-definitions/show-acceleration.xml.in index d0dcea2d6..d0dcea2d6 100644 --- a/op-mode-definitions/show-acceleration.xml +++ b/op-mode-definitions/show-acceleration.xml.in diff --git a/op-mode-definitions/show-bgp.xml.in b/op-mode-definitions/show-bgp.xml.in new file mode 100644 index 000000000..0d0a88dfb --- /dev/null +++ b/op-mode-definitions/show-bgp.xml.in @@ -0,0 +1,257 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="bgp"> + <properties> + <help>BGP information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/bgp-afi-ipv4-ipv6-common.xml.i> + <tagNode name="ipv4"> + <properties> + <help>Network in the BGP routing table to display</help> + <completionHelp> + <list><x.x.x.x> <x.x.x.x/x> <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <children> + #include <include/bgp-prefix-bestpath-multipath.xml.i> + </children> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="ipv4"> + <properties> + <help>IPv4 Address Family</help> + </properties> + <children> + #include <include/bgp-afi-common.xml.i> + #include <include/bgp-afi-ipv4-ipv6-common.xml.i> + </children> + </node> + <tagNode name="ipv6"> + <properties> + <help>Network in the BGP routing table to display</help> + <completionHelp> + <list><x.x.x.x> <x.x.x.x/x> <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <children> + #include <include/bgp-prefix-bestpath-multipath.xml.i> + </children> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="ipv6"> + <properties> + <help>IPv6 Address Family</help> + </properties> + <children> + #include <include/bgp-afi-common.xml.i> + #include <include/bgp-afi-ipv4-ipv6-common.xml.i> + </children> + </node> + <node name="l2vpn"> + <properties> + <help>Layer 2 Virtual Private Network</help> + </properties> + <children> + <tagNode name="evpn"> + <properties> + <help>Network in the BGP routing table to display</help> + <completionHelp> + <list><x.x.x.x> <x.x.x.x/x> <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> + <node name="evpn"> + <properties> + <help>Ethernet Virtual Private Network</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/bgp-afi-common.xml.i> + <node name="all"> + <properties> + <help>Display information about all EVPN NLRIs</help> + </properties> + <children> + <leafNode name="overlay"> + <properties> + <help>Display BGP Overlay Information for prefixes</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="tags"> + <properties> + <help>Display BGP tags for prefixes</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </node> + <node name="es"> + <properties> + <help>Ethernet Segment</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/vtysh-generic-detail.xml.i> + </children> + </node> + <node name="es-evi"> + <properties> + <help>Ethernet Segment per EVI</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/vtysh-generic-detail.xml.i> + #include <include/vni-tagnode.xml.i> + </children> + </node> + <leafNode name="import-rt"> + <properties> + <help>Show import route target</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <tagNode name="neighbors"> + <properties> + <help>Show detailed BGP neighbor information</help> + <completionHelp> + <script>vtysh -c 'show bgp summary' | awk '{print $1'} | grep -e '^[0-9a-f]'</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <leafNode name="advertised-routes"> + <properties> + <help>Show routes advertised to a BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="routes"> + <properties> + <help>Show routes learned from BGP neighbor</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <tagNode name="rd"> + <properties> + <help>Show detailed BGP neighbor information</help> + <completionHelp> + <list>ASN:NN IPADDRESS:NN</list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <leafNode name="overlay"> + <properties> + <help>Display BGP Overlay Information for prefixes</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="tags"> + <properties> + <help>Display BGP tags for prefixes</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </tagNode> + <node name="route"> + <properties> + <help>EVPN route information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/vtysh-generic-detail.xml.i> + <node name="type"> + <properties> + <help>Specify Route type</help> + </properties> + <children> + <leafNode name="1"> + <properties> + <help>EAD (Type-1) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="2"> + <properties> + <help>MAC-IP (Type-2) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="3"> + <properties> + <help>Multicast (Type-3) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="4"> + <properties> + <help>Ethernet Segment (Type-4) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="5"> + <properties> + <help>Prefix (Type-5) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="ead"> + <properties> + <help>EAD (Type-1) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="es"> + <properties> + <help>Ethernet Segment (Type-4) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="macip"> + <properties> + <help>MAC-IP (Type-2) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="multicast"> + <properties> + <help>Multicast (Type-3) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + <leafNode name="prefix"> + <properties> + <help>Prefix (Type-5) route</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </node> + #include <include/vni-tagnode-all.xml.i> + </children> + </node> + #include <include/vni-tagnode.xml.i> + <leafNode name="vni"> + <properties> + <help>VXLAN network identifier (VNI)</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </leafNode> + </children> + </node> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml.in index 8c1f7c398..78c350e44 100644 --- a/op-mode-definitions/show-bridge.xml +++ b/op-mode-definitions/show-bridge.xml.in @@ -29,6 +29,12 @@ </properties> <command>/sbin/brctl showstp $3</command> </leafNode> + <leafNode name="fdb"> + <properties> + <help>Show the forwarding database of the bridge</help> + </properties> + <command>/usr/sbin/bridge -c fdb show br $3</command> + </leafNode> </children> </tagNode> </children> diff --git a/op-mode-definitions/show-configuration.xml b/op-mode-definitions/show-configuration.xml.in index 318942ab0..318942ab0 100644 --- a/op-mode-definitions/show-configuration.xml +++ b/op-mode-definitions/show-configuration.xml.in diff --git a/op-mode-definitions/show-console-server.xml b/op-mode-definitions/show-console-server.xml.in index 77a7f3376..77a7f3376 100644 --- a/op-mode-definitions/show-console-server.xml +++ b/op-mode-definitions/show-console-server.xml.in diff --git a/op-mode-definitions/show-environment.xml b/op-mode-definitions/show-environment.xml.in index 95b658785..95b658785 100644 --- a/op-mode-definitions/show-environment.xml +++ b/op-mode-definitions/show-environment.xml.in diff --git a/op-mode-definitions/show-evpn.xml.in b/op-mode-definitions/show-evpn.xml.in new file mode 100644 index 000000000..0bdb41e7a --- /dev/null +++ b/op-mode-definitions/show-evpn.xml.in @@ -0,0 +1,46 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="evpn"> + <properties> + <help>Show Ethernet VPN (EVPN) information</help> + </properties> + <children> + <node name="arp-cache"> + <properties> + <help>ARP and ND cache</help> + </properties> + <children> + #include <include/vni-tagnode-all.xml.i> + </children> + </node> + <node name="mac"> + <properties> + <help>MAC addresses</help> + </properties> + <children> + #include <include/vni-tagnode-all.xml.i> + </children> + </node> + <node name="next-hops"> + <properties> + <help>Remote VTEPs</help> + </properties> + <children> + #include <include/vni-tagnode-all.xml.i> + </children> + </node> + <node name="rmac"> + <properties> + <help>RMAC</help> + </properties> + <children> + #include <include/vni-tagnode-all.xml.i> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-hardware.xml b/op-mode-definitions/show-hardware.xml.in index c3ff3a60f..0df2e4404 100644 --- a/op-mode-definitions/show-hardware.xml +++ b/op-mode-definitions/show-hardware.xml.in @@ -21,7 +21,7 @@ </node> <node name="summary"> <properties> - <help>Show CPU's on system</help> + <help>Show system CPUs</help> </properties> <command>${vyos_op_scripts_dir}/cpu_summary.py</command> </node> diff --git a/op-mode-definitions/show-history.xml b/op-mode-definitions/show-history.xml.in index 7fb286264..7fb286264 100644 --- a/op-mode-definitions/show-history.xml +++ b/op-mode-definitions/show-history.xml.in diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml.in index eee1288a1..eee1288a1 100644 --- a/op-mode-definitions/show-host.xml +++ b/op-mode-definitions/show-host.xml.in diff --git a/op-mode-definitions/show-interfaces-bonding.xml b/op-mode-definitions/show-interfaces-bonding.xml.in index f6d9b3508..f6d9b3508 100644 --- a/op-mode-definitions/show-interfaces-bonding.xml +++ b/op-mode-definitions/show-interfaces-bonding.xml.in diff --git a/op-mode-definitions/show-interfaces-bridge.xml b/op-mode-definitions/show-interfaces-bridge.xml.in index cc4b248b6..cc4b248b6 100644 --- a/op-mode-definitions/show-interfaces-bridge.xml +++ b/op-mode-definitions/show-interfaces-bridge.xml.in diff --git a/op-mode-definitions/show-interfaces-dummy.xml b/op-mode-definitions/show-interfaces-dummy.xml.in index 7c24c6921..7c24c6921 100644 --- a/op-mode-definitions/show-interfaces-dummy.xml +++ b/op-mode-definitions/show-interfaces-dummy.xml.in diff --git a/op-mode-definitions/show-interfaces-ethernet.xml b/op-mode-definitions/show-interfaces-ethernet.xml.in index fc79f44bf..fc79f44bf 100644 --- a/op-mode-definitions/show-interfaces-ethernet.xml +++ b/op-mode-definitions/show-interfaces-ethernet.xml.in diff --git a/op-mode-definitions/show-interfaces-input.xml b/op-mode-definitions/show-interfaces-input.xml.in index 15e8203e5..15e8203e5 100644 --- a/op-mode-definitions/show-interfaces-input.xml +++ b/op-mode-definitions/show-interfaces-input.xml.in diff --git a/op-mode-definitions/show-interfaces-l2tpv3.xml b/op-mode-definitions/show-interfaces-l2tpv3.xml.in index 60fee34a1..60fee34a1 100644 --- a/op-mode-definitions/show-interfaces-l2tpv3.xml +++ b/op-mode-definitions/show-interfaces-l2tpv3.xml.in diff --git a/op-mode-definitions/show-interfaces-loopback.xml b/op-mode-definitions/show-interfaces-loopback.xml.in index b30b57909..b30b57909 100644 --- a/op-mode-definitions/show-interfaces-loopback.xml +++ b/op-mode-definitions/show-interfaces-loopback.xml.in diff --git a/op-mode-definitions/show-interfaces-macsec.xml b/op-mode-definitions/show-interfaces-macsec.xml.in index 6aeab66af..6aeab66af 100644 --- a/op-mode-definitions/show-interfaces-macsec.xml +++ b/op-mode-definitions/show-interfaces-macsec.xml.in diff --git a/op-mode-definitions/show-interfaces-pppoe.xml b/op-mode-definitions/show-interfaces-pppoe.xml.in index 393ca912f..393ca912f 100644 --- a/op-mode-definitions/show-interfaces-pppoe.xml +++ b/op-mode-definitions/show-interfaces-pppoe.xml.in diff --git a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in index 195944745..195944745 100644 --- a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml +++ b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in diff --git a/op-mode-definitions/show-interfaces-tunnel.xml b/op-mode-definitions/show-interfaces-tunnel.xml.in index 416de0299..416de0299 100644 --- a/op-mode-definitions/show-interfaces-tunnel.xml +++ b/op-mode-definitions/show-interfaces-tunnel.xml.in diff --git a/op-mode-definitions/show-interfaces-vti.xml b/op-mode-definitions/show-interfaces-vti.xml.in index f51be2d19..f51be2d19 100644 --- a/op-mode-definitions/show-interfaces-vti.xml +++ b/op-mode-definitions/show-interfaces-vti.xml.in diff --git a/op-mode-definitions/show-interfaces-vxlan.xml b/op-mode-definitions/show-interfaces-vxlan.xml.in index 4e3cb93cd..4e3cb93cd 100644 --- a/op-mode-definitions/show-interfaces-vxlan.xml +++ b/op-mode-definitions/show-interfaces-vxlan.xml.in diff --git a/op-mode-definitions/show-interfaces-wirelessmodem.xml b/op-mode-definitions/show-interfaces-wirelessmodem.xml.in index c0ab9c66f..c0ab9c66f 100644 --- a/op-mode-definitions/show-interfaces-wirelessmodem.xml +++ b/op-mode-definitions/show-interfaces-wirelessmodem.xml.in diff --git a/op-mode-definitions/show-interfaces.xml b/op-mode-definitions/show-interfaces.xml.in index 39b0f0a2c..39b0f0a2c 100644 --- a/op-mode-definitions/show-interfaces.xml +++ b/op-mode-definitions/show-interfaces.xml.in diff --git a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in index a5ec65c94..d7222516a 100644 --- a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml +++ b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in @@ -11,7 +11,7 @@ <properties> <help>Show all IP access-lists</help> </properties> - <command>/usr/bin/vtysh -c "show ip access-list"</command> + <command>vtysh -c "show ip access-list"</command> </leafNode> <tagNode name="access-list"> <properties> @@ -20,13 +20,13 @@ <path>policy access-list</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show ip access-list $4"</command> + <command>vtysh -c "show ip access-list $4"</command> </tagNode> <leafNode name="as-path-access-list"> <properties> <help>Show all as-path-access-lists</help> </properties> - <command>/usr/bin/vtysh -c "show ip as-path-access-list"</command> + <command>vtysh -c "show ip as-path-access-list"</command> </leafNode> <tagNode name="as-path-access-list"> <properties> @@ -35,13 +35,13 @@ <path>policy as-path-list</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show ip as-path-access-list $4"</command> + <command>vtysh -c "show ip as-path-access-list $4"</command> </tagNode> <leafNode name="community-list"> <properties> <help>Show IP community-lists</help> </properties> - <command>/usr/bin/vtysh -c "show bgp community-list"</command> + <command>vtysh -c "show bgp community-list"</command> </leafNode> <tagNode name="community-list"> <properties> @@ -50,13 +50,13 @@ <path>policy community-list</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show bgp community-list $4 detail"</command> + <command>vtysh -c "show bgp community-list $4 detail"</command> </tagNode> <leafNode name="extcommunity-list"> <properties> <help>Show extended IP community-lists</help> </properties> - <command>/usr/bin/vtysh -c "show bgp extcommunity-list"</command> + <command>vtysh -c "show bgp extcommunity-list"</command> </leafNode> <tagNode name="extcommunity-list"> <properties> @@ -65,19 +65,19 @@ <path>policy extcommunity-list</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show bgp extcommunity-list $4 detail"</command> + <command>vtysh -c "show bgp extcommunity-list $4 detail"</command> </tagNode> <leafNode name="forwarding"> <properties> <help>Show IP forwarding status</help> </properties> - <command>/usr/bin/vtysh -c "show ip forwarding"</command> + <command>vtysh -c "show ip forwarding"</command> </leafNode> <leafNode name="large-community-list"> <properties> <help>Show IP large-community-lists</help> </properties> - <command>/usr/bin/vtysh -c "show bgp large-community-list"</command> + <command>vtysh -c "show bgp large-community-list"</command> </leafNode> <tagNode name="large-community-list"> <properties> @@ -86,13 +86,13 @@ <path>policy large-community-list</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show bgp large-community-list $4 detail"</command> + <command>vtysh -c "show bgp large-community-list $4 detail"</command> </tagNode> <leafNode name="prefix-list"> <properties> <help>Show all IP prefix-lists</help> </properties> - <command>/usr/bin/vtysh -c "show ip prefix-list"</command> + <command>vtysh -c "show ip prefix-list"</command> </leafNode> <tagNode name="prefix-list"> <properties> @@ -101,13 +101,13 @@ <path>policy prefix-list</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show ip prefix-list $4"</command> + <command>vtysh -c "show ip prefix-list $4"</command> </tagNode> <leafNode name="protocol"> <properties> <help>Show IP route-maps per protocol</help> </properties> - <command>/usr/bin/vtysh -c "show ip protocol"</command> + <command>vtysh -c "show ip protocol"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-ip-bgp.xml b/op-mode-definitions/show-ip-bgp.xml deleted file mode 100644 index 5eb2ae56e..000000000 --- a/op-mode-definitions/show-ip-bgp.xml +++ /dev/null @@ -1,342 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="ip"> - <children> - <node name="bgp"> - <properties> - <help>Show Border Gateway Protocol (BGP) information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp"</command> - <children> - <leafNode name="attribute-info"> - <properties> - <help>Show BGP attribute information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp attribute-info"</command> - </leafNode> - <leafNode name="cidr-only"> - <properties> - <help>Display only routes with non-natural netmasks</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp cidr-only"</command> - </leafNode> - <node name="community"> - <properties> - <help>Show BGP routes matching the communities</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp community"</command> - </node> - <tagNode name="community"> - <properties> - <help>Display routes matching the specified communities</help> - <completionHelp> - <list><AA:NN> local-AS no-advertise no-export</list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp community $5"</command> - </tagNode> - <leafNode name="community-info"> - <properties> - <help>List all bgp community information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp community-info"</command> - </leafNode> - <tagNode name="community-list"> - <properties> - <help>Show BGP routes matching specified community list</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp community-list $5"</command> - <children> - <leafNode name="exact-match"> - <properties> - <help>Show BGP routes exactly matching specified community list</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp community-list $5 exact-match"</command> - </leafNode> - </children> - </tagNode> - <leafNode name="dampened-paths"> - <properties> - <help>Show dampened BGP paths</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp dampening dampened-paths"</command> - </leafNode> - <tagNode name="filter-list"> - <properties> - <help>Show BGP information for specified word</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp filter-list $5"</command> - </tagNode> - <leafNode name="flap-statistics"> - <properties> - <help>Show flap statistics of routes</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp dampening flap-statistics"</command> - </leafNode> - <node name="ipv4"> - <properties> - <help>Show BGP IPv4 information</help> - </properties> - <children> - <node name="unicast"> - <properties> - <help>Show BGP IPv4 unicast information</help> - </properties> - <children> - <leafNode name="cidr-only"> - <properties> - <help>Display only routes with non-natural netmasks</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast cidr-only"</command> - </leafNode> - <node name="community"> <!-- START new code --> - <properties> - <help>Show BGP routes matching the communities</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast community"</command> - </node> - <tagNode name="community"> - <properties> - <help>Display routes matching the specified communities</help> - <completionHelp> - <list><AA:NN> local-AS no-advertise no-export</list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast community $7"</command> - </tagNode> - <tagNode name="community-list"> - <properties> - <help>Show BGP routes matching specified community list</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast community-list $7"</command> - <children> - <leafNode name="exact-match"> - <properties> - <help>Show BGP routes exactly matching specified community list</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast community-list $7 exact-match"</command> - </leafNode> - </children> - </tagNode> - <tagNode name="filter-list"> - <properties> - <help>Show BGP information for specified word</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp filter-list $5"</command> - </tagNode> - <tagNode name="neighbors"> - <properties> - <help>Show detailed BGP IPv4 unicast neighbor information</help> - <completionHelp> - <script>vtysh -c "show ip bgp ipv4 unicast summary" | awk '{print $1}' | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b"</script> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast neighbors $7"</command> - <children> - <leafNode name="advertised-routes"> - <properties> - <help>Show routes advertised to a BGP neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast neighbor $7 advertised-routes"</command> - </leafNode> - <leafNode name="prefix-counts"> - <properties> - <help>Show detailed prefix count information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast neighbor $7 prefix-counts"</command> - </leafNode> - <leafNode name="received-routes"> - <properties> - <help>Show the received routes from neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast neighbor $7 received-routes"</command> - </leafNode> - <leafNode name="routes"> - <properties> - <help>Show routes learned from neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast neighbor $7 routes"</command> - </leafNode> - </children> - </tagNode> - <leafNode name="paths"> - <properties> - <help>Show BGP path information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast paths"</command> - </leafNode> - <tagNode name="prefix-list"> - <properties> - <help>Show BGP routes matching the specified prefix list</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast prefix-list $7"</command> - </tagNode> - <tagNode name="regexp"> - <properties> - <help>Show BGP routes matching the specified AS path regular expression</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast regexp $5"</command> - </tagNode> - <tagNode name="route-map"> - <properties> - <help>Show BGP routes matching the specified route map</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp route-map $5"</command> - </tagNode> - <leafNode name="summary"> - <properties> - <help>Show summary of BGP information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp summary"</command> - </leafNode> - </children> - </node> - <tagNode name="unicast"> - <properties> - <help>Show BGP information for specified IP address or prefix</help> - <completionHelp> - <list><x.x.x.x> <x.x.x.x/x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp $6"</command> - </tagNode> - </children> - </node> - <node name="large-community"> - <properties> - <help>Show BGP routes matching the specified large-communities</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp large-community"</command> - </node> - <leafNode name="large-community-info"> - <properties> - <help>Show BGP large-community information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp large-community-info"</command> - </leafNode> - <tagNode name="large-community-list"> - <properties> - <help>Show BGP routes matching the specified large-community list</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp large-community-list $5"</command> - </tagNode> - <leafNode name="memory"> - <properties> - <help>Show BGP memory usage</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp memory"</command> - </leafNode> - <tagNode name="neighbors"> - <properties> - <help>Show detailed BGP IPv4 unicast neighbor information</help> - <completionHelp> - <script>vtysh -c "show ip bgp summary" | awk '{print $1}' | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b"</script> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbors $5"</command> - <children> - <leafNode name="advertised-routes"> - <properties> - <help>Show routes advertised to a BGP neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 advertised-routes"</command> - </leafNode> - <leafNode name="dampened-routes"> - <properties> - <help>Show dampened routes received from BGP neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 dampened-routes"</command> - </leafNode> - <leafNode name="flap-statistics"> - <properties> - <help>Show flap statistics of the routes learned from BGP neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 flap-statistics"</command> - </leafNode> - <leafNode name="prefix-counts"> - <properties> - <help>Show detailed prefix count information for BGP neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 prefix-counts"</command> - </leafNode> - <node name="received"> - <properties> - <help>Show information received from BGP neighbor</help> - </properties> - <children> - <leafNode name="prefix-filter"> - <properties> - <help>Show prefixlist filter</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 received prefix-filter"</command> - </leafNode> - </children> - </node> - <leafNode name="received-routes"> - <properties> - <help>Show received routes from BGP neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 received-routes"</command> - </leafNode> - <leafNode name="routes"> - <properties> - <help>Show routes learned from BGP neighbor</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 routes"</command> - </leafNode> - </children> - </tagNode> - <leafNode name="paths"> - <properties> - <help>Show BGP path information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp paths"</command> - </leafNode> - <tagNode name="prefix-list"> - <properties> - <help>Show BGP routes matching the specified prefix list</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp prefix-list $5"</command> - </tagNode> - <tagNode name="regexp"> - <properties> - <help>Show BGP routes matching the specified AS path regular expression</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp regexp $5"</command> - </tagNode> - <tagNode name="route-map"> - <properties> - <help>Show BGP routes matching the specified route map</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp route-map $5"</command> - </tagNode> - <leafNode name="statistics"> - <properties> - <help>Show summary of BGP information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp statistics"</command> - </leafNode> - <leafNode name="summary"> - <properties> - <help>Show summary of BGP information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp summary"</command> - </leafNode> - </children> - </node> - <tagNode name="bgp"> - <properties> - <help>Show BGP information for specified IP address or prefix</help> - <completionHelp> - <list><x.x.x.x> <x.x.x.x/x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip bgp $4"</command> - </tagNode> - </children> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/show-ip-bgp.xml.in b/op-mode-definitions/show-ip-bgp.xml.in new file mode 100644 index 000000000..9a271b4a5 --- /dev/null +++ b/op-mode-definitions/show-ip-bgp.xml.in @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="ip"> + <children> + <node name="bgp"> + <properties> + <help>Show Border Gateway Protocol (BGP) information</help> + </properties> + <command>vtysh -c "show ip bgp"</command> + <children> + #include <include/bgp-common.xml.i> + <tagNode name="vrf"> + <properties> + <help>Show bgp routing protocol for given VRF</help> + <completionHelp> + <path>vrf name</path> + <list>all</list> + </completionHelp> + </properties> + <children> + #include <include/bgp-common.xml.i> + </children> + </tagNode> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-ip-igmp.xml b/op-mode-definitions/show-ip-igmp.xml.in index b8f2f9107..855c5d508 100644 --- a/op-mode-definitions/show-ip-igmp.xml +++ b/op-mode-definitions/show-ip-igmp.xml.in @@ -13,31 +13,31 @@ <properties> <help>IGMP groups information</help> </properties> - <command>/usr/bin/vtysh -c "show ip igmp groups"</command> + <command>vtysh -c "show ip igmp groups"</command> </leafNode> <leafNode name="interfaces"> <properties> <help>IGMP interfaces information</help> </properties> - <command>/usr/bin/vtysh -c "show ip igmp interface"</command> + <command>vtysh -c "show ip igmp interface"</command> </leafNode> <leafNode name="join"> <properties> <help>IGMP static join information</help> </properties> - <command>/usr/bin/vtysh -c "show ip igmp join"</command> + <command>vtysh -c "show ip igmp join"</command> </leafNode> <leafNode name="sources"> <properties> <help>IGMP sources information</help> </properties> - <command>/usr/bin/vtysh -c "show ip igmp sources"</command> + <command>vtysh -c "show ip igmp sources"</command> </leafNode> <leafNode name="statistics"> <properties> <help>IGMP statistics</help> </properties> - <command>/usr/bin/vtysh -c "show ip igmp statistics"</command> + <command>vtysh -c "show ip igmp statistics"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-ip-multicast.xml b/op-mode-definitions/show-ip-multicast.xml.in index 5331d2e35..80d83b424 100644 --- a/op-mode-definitions/show-ip-multicast.xml +++ b/op-mode-definitions/show-ip-multicast.xml.in @@ -25,13 +25,13 @@ <properties> <help>IP multicast information</help> </properties> - <command>/usr/bin/vtysh -c "show ip multicast"</command> + <command>vtysh -c "show ip multicast"</command> </leafNode> <leafNode name="route"> <properties> <help>IP multicast routing table</help> </properties> - <command>/usr/bin/vtysh -c "show ip mroute"</command> + <command>vtysh -c "show ip mroute"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-ip-ospf.xml b/op-mode-definitions/show-ip-ospf.xml deleted file mode 100644 index 99441d185..000000000 --- a/op-mode-definitions/show-ip-ospf.xml +++ /dev/null @@ -1,579 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="ip"> - <properties> - <help>Show IPv4 routing information</help> - </properties> - <children> - <node name="ospf"> - <properties> - <help>Show IPv4 Open Shortest Path First (OSPF) routing information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf"</command> - <children> - <leafNode name="border-routers"> - <properties> - <help>Show IPv4 OSPF border-routers information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf border-routers"</command> - </leafNode> - <node name="database"> - <properties> - <help>Show IPv4 OSPF database information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database"</command> - <children> - <node name="asbr-summary"> - <properties> - <help>Show IPv4 OSPF ASBR summary database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="asbr-summary"> - <properties> - <help>Show IPv4 OSPF ASBR summary database information of given address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF ASBR summary database of given address for given advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show summary of self-originate IPv4 OSPF ASBR database</help> - </properties> - <command>show ip ospf database asbr-summary $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <node name="external"> - <properties> - <help>Show IPv4 OSPF external database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database external"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF external database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database external adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF external database for specified IP address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="external"> - <properties> - <help>Show IPv4 OSPF external database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database external"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF external database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database external $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF external database</help> - </properties> - <command>show ip ospf database external $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <leafNode name="max-age"> - <properties> - <help>Show IPv4 OSPF max-age database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database max-age"</command> - </leafNode> - <node name="network"> - <properties> - <help>Show IPv4 OSPF network database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database network"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF network database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database network adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF network database for given address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="network"> - <properties> - <help>Show IPv4 OSPF network database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database network"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF network database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database network $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF network database</help> - </properties> - <command>show ip ospf database network $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <node name="nssa-external"> - <properties> - <help>Show IPv4 OSPF NSSA external database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database nssa-external"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database nssa-external adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="nssa-external"> - <properties> - <help>Show IPv4 OSPF NSSA external database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database nssa-external"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF NSSA external database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database nssa-external $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF NSSA external database</help> - </properties> - <command>show ip ospf database nssa-external $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <node name="opaque-area"> - <properties> - <help>Show IPv4 OSPF opaque-area database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-area"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-area adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="opaque-area"> - <properties> - <help>Show IPv4 OSPF opaque-area database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-area"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-area database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-area $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF opaque-area database</help> - </properties> - <command>show ip ospf database opaque-area $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <node name="opaque-as"> - <properties> - <help>Show IPv4 OSPF opaque-as database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-as"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-as adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="opaque-as"> - <properties> - <help>Show IPv4 OSPF opaque-as database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-as"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-as database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-as $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF opaque-as database</help> - </properties> - <command>show ip ospf database opaque-as $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <node name="opaque-link"> - <properties> - <help>Show IPv4 OSPF opaque-link database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-link"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-link adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="opaque-link"> - <properties> - <help>Show IPv4 OSPF opaque-link database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-link"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF opaque-link database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database opaque-link $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF opaque-link database</help> - </properties> - <command>show ip ospf database opaque-link $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <node name="router"> - <properties> - <help>Show IPv4 OSPF router database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database router"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF router database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database router adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF router database for specified IP address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="router"> - <properties> - <help>Show IPv4 OSPF router database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database router"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF router database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database router $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF router database</help> - </properties> - <command>show ip ospf database router $6 self-originate</command> - </leafNode> - </children> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show IPv4 OSPF self-originate database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database self-originate"</command> - </leafNode> - <node name="summary"> - <properties> - <help>Show summary of IPv4 OSPF database</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database summary"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database summary adv-router $7"</command> - </tagNode> - <node name="adv-router"> - <properties> - <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help> - </properties> - </node> - </children> - </node> - <tagNode name="summary"> - <properties> - <help>Show IPv4 OSPF summary database information of specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database summary"</command> - <children> - <node name="adv-router"> - <properties> - <help>Show advertising router link states</help> - </properties> - </node> - <tagNode name="adv-router"> - <properties> - <help>Show IPv4 OSPF summary database of specified IP address for specified advertised router</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf database summary $6 adv-router $8"</command> - </tagNode> - <leafNode name="self-originate"> - <properties> - <help>Show self-originate IPv4 OSPF summary database</help> - </properties> - <command>show ip ospf database summary $6 self-originate</command> - </leafNode> - </children> - </tagNode> - </children> - </node> - <node name="interface"> - <properties> - <help>Show IPv4 OSPF interface information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf interface"</command> - </node> - <tagNode name="interface"> - <properties> - <help>Show IPv4 OSPF information for specified interface</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf interface $5"</command> - </tagNode> - <node name="neighbor"> - <properties> - <help>Show IPv4 OSPF neighbor information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf neighbor"</command> - <children> - <tagNode name="address"> - <properties> - <help>Show IPv4 OSPF neighbor information for specified IP address</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf neighbor $6"</command> - </tagNode> - <node name="detail"> - <properties> - <help>Show detailed IPv4 OSPF neighbor information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf neighbor detail"</command> - </node> - </children> - </node> - <tagNode name="neighbor"> - <properties> - <help>Show IPv4 OSPF neighbor information for specified IP address or interface</help> - <completionHelp> - <list><x.x.x.x></list> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf neighbor $5"</command> - </tagNode> - <leafNode name="route"> - <properties> - <help>Show IPv4 OSPF route information</help> - </properties> - <command>/usr/bin/vtysh -c "show ip ospf route"</command> - </leafNode> - </children> - </node> - </children> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/show-ip-ospf.xml.in b/op-mode-definitions/show-ip-ospf.xml.in new file mode 100644 index 000000000..704ed984f --- /dev/null +++ b/op-mode-definitions/show-ip-ospf.xml.in @@ -0,0 +1,36 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="ip"> + <properties> + <help>Show IPv4 routing information</help> + </properties> + <children> + <node name="ospf"> + <properties> + <help>Show IPv4 Open Shortest Path First (OSPF) routing information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/ospf-common.xml.i> + <tagNode name="vrf"> + <properties> + <help>Show OSPF routing protocol for given VRF</help> + <completionHelp> + <path>vrf name</path> + <list>all</list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/ospf-common.xml.i> + </children> + </tagNode> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-ip-pim.xml b/op-mode-definitions/show-ip-pim.xml.in index 3f4edc779..fa317a944 100644 --- a/op-mode-definitions/show-ip-pim.xml +++ b/op-mode-definitions/show-ip-pim.xml.in @@ -13,55 +13,55 @@ <properties> <help>PIM interfaces information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim interface"</command> + <command>vtysh -c "show ip pim interface"</command> </leafNode> <leafNode name="join"> <properties> <help>PIM join information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim join"</command> + <command>vtysh -c "show ip pim join"</command> </leafNode> <leafNode name="neighbor"> <properties> <help>PIM neighbor information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim neighbor"</command> + <command>vtysh -c "show ip pim neighbor"</command> </leafNode> <leafNode name="nexthop"> <properties> <help>PIM cached nexthop rpf information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim nexthop"</command> + <command>vtysh -c "show ip pim nexthop"</command> </leafNode> <leafNode name="state"> <properties> <help>PIM state information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim state"</command> + <command>vtysh -c "show ip pim state"</command> </leafNode> <leafNode name="statistics"> <properties> <help>PIM statistics</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim statistics"</command> + <command>vtysh -c "show ip pim statistics"</command> </leafNode> <leafNode name="rp"> <properties> <help>PIM RP (Rendevous Point) information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim rp-info"</command> + <command>vtysh -c "show ip pim rp-info"</command> </leafNode> <leafNode name="rpf"> <properties> <help>PIM cached source rpf information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim rpf"</command> + <command>vtysh -c "show ip pim rpf"</command> </leafNode> <leafNode name="upstream"> <properties> <help>PIM upstream information</help> </properties> - <command>/usr/bin/vtysh -c "show ip pim upstream"</command> + <command>vtysh -c "show ip pim upstream"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-ip-ports.xml b/op-mode-definitions/show-ip-ports.xml.in index a74b68ffc..a74b68ffc 100644 --- a/op-mode-definitions/show-ip-ports.xml +++ b/op-mode-definitions/show-ip-ports.xml.in diff --git a/op-mode-definitions/show-ip-rip.xml b/op-mode-definitions/show-ip-rip.xml.in index b61ab10a7..768a86ca1 100644 --- a/op-mode-definitions/show-ip-rip.xml +++ b/op-mode-definitions/show-ip-rip.xml.in @@ -11,13 +11,13 @@ <properties> <help>Show Routing Information Protocol (RIP) information</help> </properties> - <command>/usr/bin/vtysh -c "show ip rip"</command> + <command>vtysh -c "show ip rip"</command> <children> <leafNode name="status"> <properties> <help>Show RIP protocol status</help> </properties> - <command>/usr/bin/vtysh -c "show ip rip status"</command> + <command>vtysh -c "show ip rip status"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-ip-route.xml b/op-mode-definitions/show-ip-route.xml.in index a98048785..729572b4a 100644 --- a/op-mode-definitions/show-ip-route.xml +++ b/op-mode-definitions/show-ip-route.xml.in @@ -11,13 +11,13 @@ <properties> <help>Show IP routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route"</command> + <command>vtysh -c "show ip route"</command> <children> <leafNode name="bgp"> <properties> <help>Show IP BGP routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route bgp"</command> + <command>vtysh -c "show ip route bgp"</command> </leafNode> <node name="cache"> <properties> @@ -38,7 +38,7 @@ <properties> <help>Show IP connected routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route connected"</command> + <command>vtysh -c "show ip route connected"</command> </leafNode> <node name="forward"> <properties> @@ -59,43 +59,43 @@ <properties> <help>Show IP IS-IS routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route isis"</command> + <command>vtysh -c "show ip route isis"</command> </leafNode> <leafNode name="kernel"> <properties> <help>Show IP kernel routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route kernel"</command> + <command>vtysh -c "show ip route kernel"</command> </leafNode> <leafNode name="ospf"> <properties> <help>Show IP OSPF routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route ospf"</command> + <command>vtysh -c "show ip route ospf"</command> </leafNode> <leafNode name="rip"> <properties> <help>Show IP RIP routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route rip"</command> + <command>vtysh -c "show ip route rip"</command> </leafNode> <leafNode name="static"> <properties> <help>Show IP static routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route static"</command> + <command>vtysh -c "show ip route static"</command> </leafNode> <leafNode name="summary"> <properties> <help>Show IP routes summary</help> </properties> - <command>/usr/bin/vtysh -c "show ip route summary"</command> + <command>vtysh -c "show ip route summary"</command> </leafNode> <leafNode name="supernets-only"> <properties> <help>Show IP supernet routes</help> </properties> - <command>/usr/bin/vtysh -c "show ip route supernets-only"</command> + <command>vtysh -c "show ip route supernets-only"</command> </leafNode> <node name="table"> <properties> @@ -109,7 +109,7 @@ <list><1-200></list> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show ip route table $5"</command> + <command>vtysh -c "show ip route table $5"</command> </tagNode> <node name="tag"> <properties> @@ -123,7 +123,7 @@ <list><1-4294967295></list> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show ip route tag $5"</command> + <command>vtysh -c "show ip route tag $5"</command> </tagNode> <node name="vrf"> <properties> @@ -138,7 +138,7 @@ <path>vrf name</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show ip route vrf $5"</command> + <command>vtysh -c "show ip route vrf $5"</command> </tagNode> </children> </node> @@ -149,13 +149,13 @@ <list><x.x.x.x> <x.x.x.x/x></list> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show ip route $4"</command> + <command>vtysh -c "show ip route $4"</command> <children> <leafNode name="longer-prefixes"> <properties> <help>Show longer prefixes of routes for specified IP address or prefix</help> </properties> - <command>/usr/bin/vtysh -c "show ip route $4 longer-prefixes"</command> + <command>vtysh -c "show ip route $4 longer-prefixes"</command> </leafNode> </children> </tagNode> diff --git a/op-mode-definitions/show-ip.xml.in b/op-mode-definitions/show-ip.xml.in new file mode 100644 index 000000000..91564440d --- /dev/null +++ b/op-mode-definitions/show-ip.xml.in @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="ip"> + <properties> + <help>Show IPv4 routing information</help> + </properties> + <children> + <node name="neighbors"> + <properties> + <help>Show IPv4 Neighbor Discovery (ND) information</help> + </properties> + <command>${vyos_op_scripts_dir}/show_neigh.py --family inet</command> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-ipv6-bgp.xml b/op-mode-definitions/show-ipv6-bgp.xml deleted file mode 100644 index aad61b97a..000000000 --- a/op-mode-definitions/show-ipv6-bgp.xml +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="ipv6"> - <properties> - <help>Show IPv6 routing information</help> - </properties> - <children> - <node name="bgp"> - <properties> - <help>Show Border Gateway Protocol (BGP) information</help> - </properties> - <command>vtysh -c "show bgp ipv6"</command> - <children> - <leafNode name="summary"> - <properties> - <help>Show summary of BGP neighbor status</help> - </properties> - <command>vtysh -c "show bgp ipv6 summary"</command> - </leafNode> - <tagNode name="regexp"> - <properties> - <help>Show routes matching AS path regular expression</help> - </properties> - <command>vtysh -c "show bgp ipv6 regexp $5"</command> - </tagNode> - <tagNode name="prefix-list"> - <properties> - <help>Show routes matching the IPv6 prefix-list name</help> - <completionHelp> - <path>policy prefix-list6</path> - </completionHelp> - </properties> - <command>vtysh -c "show bgp ipv6 prefix-list $5"</command> - </tagNode> - <tagNode name="neighbors"> - <properties> - <help>Show detailed information on TCP and BGP neighbor connections for given address</help> - <completionHelp> - <script>vtysh -c "show bgp ipv6 summary" | awk '{print $1}' | grep -oE "\b([0-9a-f]{1,4}\:{0,2}){0,20}\b"</script> - </completionHelp> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5"</command> - <children> - <leafNode name="advertised-routes"> - <properties> - <help>Show routes advertised to a BGP neighbor</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 advertised-routes"</command> - </leafNode> - <leafNode name="filtered-routes"> - <properties> - <help>Show routes filtered from a BGP neighbor</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 filtered-routes"</command> - </leafNode> - <leafNode name="dampened-routes"> - <properties> - <help>Show dampened routes received from BGP neighbor</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 dampened-routes"</command> - </leafNode> - <leafNode name="flap-statistics"> - <properties> - <help>Show flap statistics of the routes learned from BGP neighbor</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 flap-statistics"</command> - </leafNode> - <leafNode name="prefix-counts"> - <properties> - <help>Show detailed prefix count information for BGP neighbor</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 prefix-counts"</command> - </leafNode> - <node name="received"> - <properties> - <help>Show information received from BGP neighbor</help> - </properties> - <children> - <leafNode name="prefix-filter"> - <properties> - <help>Show prefixlist filter</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 received prefix-filter"</command> - </leafNode> - </children> - </node> - <leafNode name="received-routes"> - <properties> - <help>Show received routes from BGP neighbor</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 received-routes"</command> - </leafNode> - <leafNode name="routes"> - <properties> - <help>Show routes learned from BGP neighbor</help> - </properties> - <command>vtysh -c "show bgp ipv6 neighbor $5 routes"</command> - </leafNode> - </children> - </tagNode> - <tagNode name="large-community"> - <properties> - <help>Show routes matching the large-community-list number or name</help> - </properties> - <command>vtysh -c "show bgp ipv6 large-community-list $5"</command> - <children> - <node name="exact-match"> - <properties> - <help>Show routes matching the large-community-list number or name</help> - </properties> - <command>vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command> - </node> - </children> - </tagNode> - <tagNode name="large-community-list"> - <properties> - <help>Show routes matching the large-community-list number or name</help> - </properties> - <command>vtysh -c "show bgp ipv6 large-community-list $5"</command> - <children> - <node name="exact-match"> - <properties> - <help>Show routes matching the large-community-list number or name</help> - </properties> - <command>vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command> - </node> - </children> - </tagNode> - <tagNode name="filter-list"> - <properties> - <help>Show routes conforming to regular expression access list name</help> - </properties> - <command>vtysh -c "show bgp ipv6 filter-list $5"</command> - </tagNode> - <tagNode name="community"> - <properties> - <help>Show BGP information for specified community number</help> - <completionHelp> - <list><AA:NN> local-AS no-advertise no-export</list> - </completionHelp> - </properties> - <command>vtysh -c "show bgp ipv6 community $5"</command> - <children> - <node name="exact-match"> - <properties> - <help>Show routes from community that exactly matches the community number</help> - </properties> - <command>vtysh -c "show bgp ipv6 community $5 exact-match"</command> - </node> - </children> - </tagNode> - <tagNode name="community-list"> - <properties> - <help>Show routes matching the community-list number or name</help> - </properties> - <command>vtysh -c "show bgp ipv6 community-list $5"</command> - <children> - <node name="exact-match"> - <properties> - <help>Show routes exactly matching the community-list name or number</help> - </properties> - <command>vtysh -c "show bgp ipv6 community-list $5 exact-match"</command> - </node> - </children> - </tagNode> - <tagNode name="route-map"> - <properties> - <help>Show BGP routes matching the specified route map</help> - <completionHelp> - <path>policy route-map</path> - </completionHelp> - </properties> - <command>vtysh -c "show bgp ipv6 route-map $5"</command> - </tagNode> - </children> - </node> - <tagNode name="bgp"> - <properties> - <help>Show BGP information for specified IP address or prefix</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show bgp ipv6 $4"</command> - <children> - <node name="longer-prefixes"> - <properties> - <help>Show route and more specific routes</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show bgp ipv6 $4 longer-prefixes"</command> - </node> - </children> - </tagNode> - </children> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml b/op-mode-definitions/show-ipv6-ospfv3.xml deleted file mode 100644 index 36bb5b40e..000000000 --- a/op-mode-definitions/show-ipv6-ospfv3.xml +++ /dev/null @@ -1,777 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="ipv6"> - <properties> - <help>Show IPv6 routing information</help> - </properties> - <children> - <node name="ospfv3"> - <properties> - <help>Show IPv6 Open Shortest Path First (OSPF)</help> - </properties> - <command>vtysh -c "show ipv6 ospf6"</command> - <children> - <node name="area"> - <properties> - <help>Show Shortest Path First tree information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 spf tree"</command> - </node> - <tagNode name="area"> - <properties> - <help>Area ID (as an IPv4 notation)</help> - <completionHelp> - <path>protocols ospfv3 area</path> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 area $4 spf tree"</command> - <children> - <tagNode name="router"> - <properties> - <help> Simulate view point (Router ID)</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 simulate spf-tree $7 $4 $5"</command> - </tagNode> - </children> - </tagNode> - <node name="border-routers"> - <properties> - <help>Show OSPFv3 border-router (ABR and ASBR) information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers"</command> - <children> - <node name="detail"> - <properties> - <help>Show OSPFv3 detailed border-router information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers detail"</command> - </node> - </children> - </node> - <tagNode name="border-routers"> - <properties> - <help>Border router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers $5"</command> - </tagNode> - <node name="database"> - <properties> - <help>Show OSPFv3 Link state database information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database adv-router $6 linkstate-id $8 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database adv-router $6 linkstate-id $8 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database adv-router $6 linkstate-id $8 internal"</command> - </node> - </children> - </tagNode> - </children> - </tagNode> - <node name="any"> - <properties> - <help>Search by Any Link state Type</help> - </properties> - <children> - <tagNode name="any"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * * $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * * $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * * $7 internal"</command> - </node> - </children> - </tagNode> - </children> - </node> - <tagNode name="any"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 internal"</command> - </node> - <node name="node.tag"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7 internal"</command> - </node> - </children> - </node> - </children> - </tagNode> - - - - - - <node name="as-external"> - <properties> - <help>Show AS-External LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external adv-router $7 linkstate-id $9 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external adv-router $7 linkstate-id $9 internal"</command> - </node> - </children> - </tagNode> - </children> - </tagNode> - <tagNode name="any"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7 internal"</command> - </node> - </children> - </tagNode> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external internal"</command> - </node> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external linkstate-id $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external linkstate-id $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external linkstate-id $7 internal"</command> - </node> - </children> - </tagNode> - <node name="self-originated"> - <properties> - <help>Show Self-originated LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated internal"</command> - </node> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated linkstate-id $8 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated linkstate-id $8 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated linkstate-id $8 internal"</command> - </node> - </children> - </tagNode> - </children> - </node> - </children> - </node> - <tagNode name="as-external"> - <properties> - <help>Search by Advertising Router IDs</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 internal"</command> - </node> - <node name="self-originated"> - <properties> - <help>Show Self-originated LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated internal"</command> - </node> - </children> - </node> - <node name="node.tag"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>echo vtysh -c "show ipv6 ospf6 database as-external $6 $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>echo vtysh -c "show ipv6 ospf6 database as-external $6 $7 internal"</command> - </node> - </children> - </node> - </children> - </tagNode> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database dump"</command> - </node> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database linkstate-id $6 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database linkstate-id $6 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database linkstate-id $6 internal"</command> - </node> - </children> - </tagNode> - <node name="self-originated"> - <properties> - <help>Show Self-originated LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated internal"</command> - </node> - </children> - </node> - </children> - </node> - <node name="interface"> - <properties> - <help>Show OSPFv3 interface information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface"</command> - <children> - <node name="prefix"> - <properties> - <help>Show connected prefixes to advertise</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix detail"</command> - </node> - </children> - </node> - <tagNode name="prefix"> - <properties> - <help>Show interface prefix route specific information</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6 detail"</command> - </node> - <node name="match"> - <properties> - <help>Matched interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6 match"</command> - </node> - </children> - </tagNode> - </children> - </node> - <tagNode name="interface"> - <properties> - <help>Specific insterface to examine</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5"</command> - <children> - <node name="prefix"> - <properties> - <help>Show connected prefixes to advertise</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix detail"</command> - </node> - </children> - </node> - <tagNode name="prefix"> - <properties> - <help>Show interface prefix route specific information</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7 detail"</command> - </node> - <node name="match"> - <properties> - <help>Matched interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7 match"</command> - </node> - </children> - </tagNode> - </children> - </tagNode> - <node name="linkstate"> - <properties> - <help>Show OSPFv3 linkstate routing information</help> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show detailed linkstate information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 linkstate detail"</command> - </node> - <node name="network"> - <properties> - <help>Show linkstate Network information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 linkstate network"</command> - </node> - <node name="router"> - <properties> - <help>Show linkstate Router information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 linkstate router"</command> - </node> - </children> - </node> - <node name="neighbor"> - <properties> - <help>Show OSPFv3 neighbor information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed neighbor information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor detail"</command> - </node> - <node name="drchoice"> - <properties> - <help>Show neighbor DR choice information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor drchoice"</command> - </node> - </children> - </node> - <node name="redistribute"> - <properties> - <help>Show OSPFv3 redistribute external information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 redistribute"</command> - </node> - <node name="route"> - <properties> - <help>Show OSPFv3 routing table information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route"</command> - <children> - <node name="external-1"> - <properties> - <help>Show Type-1 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-1"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Type-1 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-1 detail"</command> - </node> - </children> - </node> - <node name="external-2"> - <properties> - <help>Show Type-2 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-2"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Type-2 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-2 detail"</command> - </node> - </children> - </node> - <node name="inter-area"> - <properties> - <help>Show Inter-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route inter-area"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Inter-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route inter-area detail"</command> - </node> - </children> - </node> - <node name="intra-area"> - <properties> - <help>Show Intra-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route intra-area"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Intra-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route intra-area detail"</command> - </node> - </children> - </node> - <node name="detail"> - <properties> - <help>Show detailed route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route detail"</command> - </node> - <node name="summary"> - <properties> - <help>Show route table summary</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route summary"</command> - </node> - </children> - </node> - <tagNode name="route"> - <properties> - <help>Show specified route/prefix information</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5"</command> - <children> - <node name="longer"> - <properties> - <help>Show routes longer than specified prefix</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 longer"</command> - </node> - <node name="match"> - <properties> - <help>Show routes matching specified prefix</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 match"</command> - <children> - <node name="detail"> - <properties> - <help>Detailed information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 match detail"</command> - </node> - </children> - </node> - </children> - </tagNode> - </children> - </node> - </children> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml.in b/op-mode-definitions/show-ipv6-ospfv3.xml.in new file mode 100644 index 000000000..9227fdae1 --- /dev/null +++ b/op-mode-definitions/show-ipv6-ospfv3.xml.in @@ -0,0 +1,502 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="ipv6"> + <properties> + <help>Show IPv6 routing information</help> + </properties> + <children> + <node name="ospfv3"> + <properties> + <help>Show IPv6 Open Shortest Path First (OSPF)</help> + </properties> + <command>vtysh -c "show ipv6 ospf6"</command> + <children> + <node name="area"> + <properties> + <help>Show Shortest Path First tree information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 spf tree"</command> + </node> + <tagNode name="area"> + <properties> + <help>Area ID (as an IPv4 notation)</help> + <completionHelp> + <path>protocols ospfv3 area</path> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 area $4 spf tree"</command> + <children> + <tagNode name="router"> + <properties> + <help> Simulate view point (Router ID)</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 simulate spf-tree $7 $4 $5"</command> + </tagNode> + </children> + </tagNode> + <node name="border-routers"> + <properties> + <help>Show OSPFv3 border-router (ABR and ASBR) information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 border-routers"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <tagNode name="border-routers"> + <properties> + <help>Border router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 border-routers $5"</command> + </tagNode> + <node name="database"> + <properties> + <help>Show OSPFv3 Link state database information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 database"</command> + <children> + <tagNode name="adv-router"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-linkstate-id.xml.i> + </children> + </tagNode> + <node name="any"> + <properties> + <help>Search by Any Link state Type</help> + </properties> + <children> + <tagNode name="any"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> + </tagNode> + </children> + </node> + <tagNode name="any"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 database * $6"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-adv-router-id-node-tag.xml.i> + </children> + </tagNode> + <node name="as-external"> + <properties> + <help>Show AS-External LSAs</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 database as-external"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + <tagNode name="any"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 database as-external * $7"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> + </tagNode> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <tagNode name="as-external"> + <properties> + <help>Search by Advertising Router IDs</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-self-originated.xml.i> + #include <include/ospfv3-adv-router-id-node-tag.xml.i> + </children> + </tagNode> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-self-originated.xml.i> + <node name="group-membership"> + <properties> + <help>Show Group-Membership LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="inter-prefix"> + <properties> + <help>Show Inter-Area-Prefix LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="inter-router"> + <properties> + <help>Show Inter-Area-Router LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="intra-prefix"> + <properties> + <help>Show Intra-Area-Prefix LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="link"> + <properties> + <help>Show Link LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="network"> + <properties> + <help>Show Network LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="node.tag"> + <properties> + <help>Show LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="router"> + <properties> + <help>Show router LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="type-7"> + <properties> + <help>Show Type-7 LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-linkstate-id-node-tag.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + </children> + </node> + <node name="interface"> + <properties> + <help>Show OSPFv3 interface information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface"</command> + <children> + <node name="prefix"> + <properties> + <help>Show connected prefixes to advertise</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface prefix"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <tagNode name="prefix"> + <properties> + <help>Show interface prefix route specific information</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface prefix $6"</command> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="match"> + <properties> + <help>Matched interface prefix information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface prefix $6 match"</command> + </node> + </children> + </tagNode> + </children> + </node> + <tagNode name="interface"> + <properties> + <help>Specific insterface to examine</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces.py</script> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5"</command> + <children> + <node name="prefix"> + <properties> + <help>Show connected prefixes to advertise</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5 prefix"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <tagNode name="prefix"> + <properties> + <help>Show interface prefix route specific information</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7"</command> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="match"> + <properties> + <help>Matched interface prefix information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7 match"</command> + </node> + </children> + </tagNode> + </children> + </tagNode> + <node name="linkstate"> + <properties> + <help>Show OSPFv3 linkstate routing information</help> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="network"> + <properties> + <help>Show linkstate Network information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 linkstate network"</command> + </node> + <node name="router"> + <properties> + <help>Show linkstate Router information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 linkstate router"</command> + </node> + </children> + </node> + <node name="neighbor"> + <properties> + <help>Show OSPFv3 neighbor information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 neighbor"</command> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="drchoice"> + <properties> + <help>Show neighbor DR choice information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 neighbor drchoice"</command> + </node> + </children> + </node> + <node name="redistribute"> + <properties> + <help>Show OSPFv3 redistribute external information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 redistribute"</command> + </node> + <node name="route"> + <properties> + <help>Show OSPFv3 routing table information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route"</command> + <children> + <node name="external-1"> + <properties> + <help>Show Type-1 External route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route external-1"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <node name="external-2"> + <properties> + <help>Show Type-2 External route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route external-2"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <node name="inter-area"> + <properties> + <help>Show Inter-Area route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route inter-area"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <node name="intra-area"> + <properties> + <help>Show Intra-Area route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route intra-area"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + #include <include/ospfv3-detail.xml.i> + <node name="summary"> + <properties> + <help>Show route table summary</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route summary"</command> + </node> + </children> + </node> + <tagNode name="route"> + <properties> + <help>Show specified route/prefix information</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 route $5"</command> + <children> + <node name="longer"> + <properties> + <help>Show routes longer than specified prefix</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route $5 longer"</command> + </node> + <node name="match"> + <properties> + <help>Show routes matching specified prefix</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route $5 match"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + </children> + </tagNode> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-ipv6-prefix-list.xml b/op-mode-definitions/show-ipv6-prefix-list.xml.in index e003ad110..e003ad110 100644 --- a/op-mode-definitions/show-ipv6-prefix-list.xml +++ b/op-mode-definitions/show-ipv6-prefix-list.xml.in diff --git a/op-mode-definitions/show-ipv6-route.xml b/op-mode-definitions/show-ipv6-route.xml.in index fafd615ea..065ea6f1f 100644 --- a/op-mode-definitions/show-ipv6-route.xml +++ b/op-mode-definitions/show-ipv6-route.xml.in @@ -7,23 +7,6 @@ <help>Show IPv6 routing information</help> </properties> <children> - <tagNode name="route"> - <properties> - <help>Show IPv6 routes of given address or prefix</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <children> - <node name="longer-prefixes"> - <properties> - <help>Show longer prefixes of routes for given address or prefix</help> - </properties> - <command>vtysh -c "show ipv6 route $4 longer-prefixes"</command> - </node> - </children> - <command>vtysh -c "show ipv6 route $4"</command> - </tagNode> <node name="route"> <properties> <help>Show IPv6 routes</help> @@ -36,12 +19,42 @@ </properties> <command>vtysh -c "show ipv6 route bgp"</command> </node> + <node name="cache"> + <properties> + <help>Show kernel IPv6 route cache</help> + </properties> + <command>ip -s -f inet6 route list cache</command> + </node> + <tagNode name="cache"> + <properties> + <help>Show kernel IPv6 route cache for a given route</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>ip -s -f inet6 route list cache $5</command> + </tagNode> <node name="connected"> <properties> <help>Show IPv6 connected routes</help> </properties> <command>vtysh -c "show ipv6 route connected"</command> </node> + <node name="forward"> + <properties> + <help>Show kernel IPv6 route table</help> + </properties> + <command>ip -f inet6 route list</command> + </node> + <tagNode name="forward"> + <properties> + <help>Show kernel IPv6 route table for a given route</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>ip -s -f inet6 route list $5</command> + </tagNode> <node name="isis"> <properties> <help>Show IPv6 IS-IS routes</help> @@ -110,6 +123,23 @@ </tagNode> </children> </node> + <tagNode name="route"> + <properties> + <help>Show IPv6 routes of given address or prefix</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <children> + <node name="longer-prefixes"> + <properties> + <help>Show longer prefixes of routes for given address or prefix</help> + </properties> + <command>vtysh -c "show ipv6 route $4 longer-prefixes"</command> + </node> + </children> + <command>vtysh -c "show ipv6 route $4"</command> + </tagNode> </children> </node> </children> diff --git a/op-mode-definitions/show-ipv6.xml b/op-mode-definitions/show-ipv6.xml.in index a59c8df0c..a59c8df0c 100644 --- a/op-mode-definitions/show-ipv6.xml +++ b/op-mode-definitions/show-ipv6.xml.in diff --git a/op-mode-definitions/show-isis.xml b/op-mode-definitions/show-isis.xml deleted file mode 100644 index 4e308730f..000000000 --- a/op-mode-definitions/show-isis.xml +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="isis"> - <properties> - <help>IS-IS routing protocol</help> - </properties> - <children> - <node name="database"> - <properties> - <help>Show IS-IS link state database</help> - </properties> - <children> - <leafNode name="detail"> - <properties> - <help>Show detailed information</help> - </properties> - <command>/usr/bin/vtysh -c "show isis database detail"</command> - </leafNode> - </children> - <command>/usr/bin/vtysh -c "show isis database"</command> - </node> - <tagNode name="database"> - <properties> - <help>Show IS-IS link state database PDU</help> - <completionHelp> - <list>lsp-id detail</list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show isis database $4"</command> - </tagNode> - <leafNode name="hostname"> - <properties> - <help>Show IS-IS dynamic hostname mapping</help> - </properties> - <command>/usr/bin/vtysh -c "show isis hostname"</command> - </leafNode> - <node name="interface"> - <properties> - <help>Show IS-IS interfaces</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <children> - <leafNode name="detail"> - <properties> - <help>Show detailed information</help> - </properties> - <command>/usr/bin/vtysh -c "show isis interface detail"</command> - </leafNode> - </children> - <command>/usr/bin/vtysh -c "show isis interface"</command> - </node> - <tagNode name="interface"> - <properties> - <help>Show specific IS-IS interface</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show isis interface $4"</command> - </tagNode> - <node name="traffic-engineering"> - <properties> - <help>Show IS-IS MPLS traffic engineering information</help> - </properties> - <children> - <leafNode name="router"> - <properties> - <help>Show router information</help> - </properties> - <command>/usr/bin/vtysh -c "show isis mpls-te router"</command> - </leafNode> - <leafNode name="interface"> - <properties> - <help>Show interface information</help> - </properties> - <command>/usr/bin/vtysh -c "show isis mpls-te interface"</command> - </leafNode> - <tagNode name="interface"> - <properties> - <help>Show specific IS-IS interface</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show isis mpls-te interface $5"</command> - </tagNode> - </children> - </node> - <node name="neighbor"> - <properties> - <help>Show IS-IS neighbor adjacencies</help> - </properties> - <children> - <leafNode name="detail"> - <properties> - <help>Show detailed information</help> - </properties> - <command>/usr/bin/vtysh -c "show isis neighbor detail"</command> - </leafNode> - </children> - <command>/usr/bin/vtysh -c "show isis neighbor"</command> - </node> - <tagNode name="neighbor"> - <properties> - <help>Show specific IS-IS neighbor adjacency </help> - <completionHelp> - <list>system-id</list> - </completionHelp> - </properties> - <command>/usr/bin/vtysh -c "show isis neighbor $4"</command> - </tagNode> - <node name="route"> - <properties> - <help>Show IS-IS routing table</help> - </properties> - <children> - <leafNode name="level-1"> - <properties> - <help>Show level-1 routes</help> - </properties> - <command>/usr/bin/vtysh -c "show isis route level-1"</command> - </leafNode> - <leafNode name="level-2"> - <properties> - <help>Show level-2 routes</help> - </properties> - <command>/usr/bin/vtysh -c "show isis route level-2"</command> - </leafNode> - </children> - <command>/usr/bin/vtysh -c "show isis route"</command> - </node> - <node name="segment-routing"> - <properties> - <help>Show IS-IS Segment-Routing (SPRING) information</help> - </properties> - <children> - <leafNode name="node"> - <properties> - <help>Show node information</help> - </properties> - <command>/usr/bin/vtysh -c "show isis segment-routing node"</command> - </leafNode> - <leafNode name="prefix-sids"> - <properties> - <help>Show prefix segment IDs</help> - </properties> - <command>/usr/bin/vtysh -c "show isis segment-routing prefix-sids"</command> - </leafNode> - </children> - </node> - <leafNode name="spf-delay"> - <properties> - <help>Show IS-IS SPF delay parameters</help> - </properties> - <command>/usr/bin/vtysh -c "show isis spf-delay-ietf"</command> - </leafNode> - <leafNode name="summary"> - <properties> - <help>Show IS-IS information summary</help> - </properties> - <command>/usr/bin/vtysh -c "show isis summary"</command> - </leafNode> - <node name="topology"> - <properties> - <help>Show IS-IS paths to Intermediate Systems</help> - </properties> - <children> - <leafNode name="level-1"> - <properties> - <help>Show level-1 routes</help> - </properties> - <command>/usr/bin/vtysh -c "show isis topology level-1"</command> - </leafNode> - <leafNode name="level-2"> - <properties> - <help>Show level-2 routes</help> - </properties> - <command>/usr/bin/vtysh -c "show isis topology level-2"</command> - </leafNode> - </children> - <command>/usr/bin/vtysh -c "show isis topology"</command> - </node> - </children> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/show-isis.xml.in b/op-mode-definitions/show-isis.xml.in new file mode 100644 index 000000000..202e3214b --- /dev/null +++ b/op-mode-definitions/show-isis.xml.in @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="isis"> + <properties> + <help>Show IS-IS routing protocol</help> + </properties> + <children> + #include <include/isis-common.xml.i> + <tagNode name="vrf"> + <properties> + <help>Show IS-IS routing protocol for given VRF</help> + <completionHelp> + <path>vrf name</path> + <list>all</list> + </completionHelp> + </properties> + <children> + #include <include/isis-common.xml.i> + </children> + </tagNode> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-license.xml b/op-mode-definitions/show-license.xml.in index 2ce11567d..2ce11567d 100644 --- a/op-mode-definitions/show-license.xml +++ b/op-mode-definitions/show-license.xml.in diff --git a/op-mode-definitions/show-log.xml b/op-mode-definitions/show-log.xml.in index b00e4cfec..58216bfd1 100644 --- a/op-mode-definitions/show-log.xml +++ b/op-mode-definitions/show-log.xml.in @@ -12,7 +12,7 @@ <properties> <help>Show contents of all master log files</help> </properties> - <command>eval $(lesspipe); less $_vyatta_less_options --prompt=".log?m, file %i of %m., page %dt of %D" -- `printf "%s\n" /var/log/messages* | sort -nr`</command> + <command>sudo bash -c 'eval $(lesspipe); less $_vyatta_less_options --prompt=".logm, file %i of %m., page %dt of %D" -- `printf "%s\n" /var/log/messages* | sort -nr`'</command> </leafNode> <leafNode name="authorization"> <properties> diff --git a/op-mode-definitions/show-login.xml b/op-mode-definitions/show-login.xml.in index 6d8c782c4..6d8c782c4 100644 --- a/op-mode-definitions/show-login.xml +++ b/op-mode-definitions/show-login.xml.in diff --git a/op-mode-definitions/show-monitoring.xml b/op-mode-definitions/show-monitoring.xml.in index 2651b3438..2651b3438 100644 --- a/op-mode-definitions/show-monitoring.xml +++ b/op-mode-definitions/show-monitoring.xml.in diff --git a/op-mode-definitions/show-mpls.xml b/op-mode-definitions/show-mpls.xml.in index 833ac98eb..86f6f1bcc 100644 --- a/op-mode-definitions/show-mpls.xml +++ b/op-mode-definitions/show-mpls.xml.in @@ -16,41 +16,41 @@ <properties> <help>Label Information Base</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding"</command> + <command>vtysh -c "show mpls ldp binding"</command> <children> <node name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding detail"</command> + <command>vtysh -c "show mpls ldp binding detail"</command> </node> <tagNode name="neighbor"> <properties> <help>Display labels from LDP neighbor</help> <completionHelp> <list><x.x.x.x> <h:h:h:h:h:h:h:h></list> - <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> + <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6"</command> + <command>vtysh -c "show mpls ldp binding neighbor $6"</command> <children> <leafNode name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6 detail"</command> + <command>vtysh -c "show mpls ldp binding neighbor $6 detail"</command> </leafNode> <tagNode name="local-label"> <properties> <help>Match locally assigned label value</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6 local-label $8"</command> + <command>vtysh -c "show mpls ldp binding neighbor $6 local-label $8"</command> </tagNode> <tagNode name="remote-label"> <properties> <help>Match remotely assigned label value</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6 remote-label $8"</command> + <command>vtysh -c "show mpls ldp binding neighbor $6 remote-label $8"</command> </tagNode> </children> </tagNode> @@ -58,29 +58,29 @@ <properties> <help>Match locally assigned label value</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6"</command> + <command>vtysh -c "show mpls ldp binding local-label $6"</command> <children> <leafNode name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6 detail"</command> + <command>vtysh -c "show mpls ldp binding local-label $6 detail"</command> </leafNode> <tagNode name="neighbor"> <properties> <help>Match LDP neighbor</help> <completionHelp> <list><x.x.x.x> <h:h:h:h:h:h:h:h></list> - <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> + <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6 neighbor $8"</command> + <command>vtysh -c "show mpls ldp binding local-label $6 neighbor $8"</command> </tagNode> <tagNode name="remote-label"> <properties> <help>Match remotely assigned label value</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6 remote-label $8"</command> + <command>vtysh -c "show mpls ldp binding local-label $6 remote-label $8"</command> </tagNode> </children> </tagNode> @@ -88,29 +88,29 @@ <properties> <help>Match remotely assigned label value</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6"</command> + <command>vtysh -c "show mpls ldp binding remote-label $6"</command> <children> <leafNode name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6 detail"</command> + <command>vtysh -c "show mpls ldp binding remote-label $6 detail"</command> </leafNode> <tagNode name="neighbor"> <properties> <help>Match LDP neighbor</help> <completionHelp> <list><x.x.x.x> <h:h:h:h:h:h:h:h></list> - <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> + <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6 neighbor $8"</command> + <command>vtysh -c "show mpls ldp binding remote-label $6 neighbor $8"</command> </tagNode> <tagNode name="local-label"> <properties> <help>Match locally assigned label value</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6 local-label $8"</command> + <command>vtysh -c "show mpls ldp binding remote-label $6 local-label $8"</command> </tagNode> </children> </tagNode> @@ -123,13 +123,13 @@ <list><x.x.x.x/x> <h:h:h:h:h:h:h:h/h></list> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding $5"</command> + <command>vtysh -c "show mpls ldp binding $5"</command> <children> <leafNode name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp binding $5 detail"</command> + <command>vtysh -c "show mpls ldp binding $5 detail"</command> </leafNode> </children> </tagNode> @@ -137,13 +137,13 @@ <properties> <help>Discovery hello information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp discovery"</command> + <command>vtysh -c "show mpls ldp discovery"</command> <children> <leafNode name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp discovery detail"</command> + <command>vtysh -c "show mpls ldp discovery detail"</command> </leafNode> </children> </node> @@ -151,25 +151,25 @@ <properties> <help>LDP interface information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp interface"</command> + <command>vtysh -c "show mpls ldp interface"</command> </node> <node name="neighbor"> <properties> <help>LDP neighbor information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp neighbor"</command> + <command>vtysh -c "show mpls ldp neighbor"</command> <children> <leafNode name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp neighbor detail"</command> + <command>vtysh -c "show mpls ldp neighbor detail"</command> </leafNode> <leafNode name="capabilities"> <properties> <help>Show neighbor capability information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp neighbor capabilities"</command> + <command>vtysh -c "show mpls ldp neighbor capabilities"</command> </leafNode> </children> </node> @@ -178,22 +178,22 @@ <help>LDP neighbor</help> <completionHelp> <list><x.x.x.x> <h:h:h:h:h:h:h:h></list> - <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> + <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp neighbor $5"</command> + <command>vtysh -c "show mpls ldp neighbor $5"</command> <children> <leafNode name="detail"> <properties> <help>Show detailed information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp neighbor $5 detail"</command> + <command>vtysh -c "show mpls ldp neighbor $5 detail"</command> </leafNode> <leafNode name="capabilities"> <properties> <help>Show neighbor capability information</help> </properties> - <command>/usr/bin/vtysh -c "show mpls ldp neighbor $5 capabilities"</command> + <command>vtysh -c "show mpls ldp neighbor $5 capabilities"</command> </leafNode> </children> </tagNode> @@ -203,13 +203,13 @@ <properties> <help>Show MPLS pseudowire interfaces</help> </properties> - <command>/usr/bin/vtysh -c "show mpls pseudowires"</command> + <command>vtysh -c "show mpls pseudowires"</command> </node> <node name="table"> <properties> <help>Show MPLS table</help> </properties> - <command>/usr/bin/vtysh -c "show mpls table"</command> + <command>vtysh -c "show mpls table"</command> </node> </children> </node> diff --git a/op-mode-definitions/show-ntp.xml b/op-mode-definitions/show-ntp.xml.in index b7f0acdf8..01f4477d8 100644 --- a/op-mode-definitions/show-ntp.xml +++ b/op-mode-definitions/show-ntp.xml.in @@ -6,7 +6,7 @@ <properties> <help>Show peer status of NTP daemon</help> </properties> - <command>if ps -C ntpd &>/dev/null; then ntpq -n -c peers; else echo NTP daemon disabled; fi</command> + <command>${vyos_op_scripts_dir}/show_ntp.sh --basic</command> <children> <tagNode name="server"> <properties> @@ -15,15 +15,14 @@ <script>${vyos_completion_dir}/list_ntp_servers.sh</script> </completionHelp> </properties> - <command>/usr/sbin/ntpdate -q "$4"</command> + <command>${vyos_op_scripts_dir}/show_ntp.sh --server "$4"</command> </tagNode> <node name="info"> <properties> <help>Show NTP operational summary</help> </properties> - <command>if ps -C ntpd &>/dev/null; then ntpq -n -c sysinfo; ntpq -n -c kerninfo; else echo NTP daemon disabled; fi</command> - </node> - + <command>${vyos_op_scripts_dir}/show_ntp.sh --info</command> + </node> </children> </node> </children> diff --git a/op-mode-definitions/show-poweroff.xml b/op-mode-definitions/show-poweroff.xml.in index 1fd2afcc3..1fd2afcc3 100644 --- a/op-mode-definitions/show-poweroff.xml +++ b/op-mode-definitions/show-poweroff.xml.in diff --git a/op-mode-definitions/show-protocols-bfd.xml b/op-mode-definitions/show-protocols-bfd.xml.in index 3d9b67c67..886b01e51 100644 --- a/op-mode-definitions/show-protocols-bfd.xml +++ b/op-mode-definitions/show-protocols-bfd.xml.in @@ -13,13 +13,13 @@ <properties> <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help> </properties> - <command>/usr/bin/vtysh -c "show bfd peers"</command> + <command>vtysh -c "show bfd peers"</command> <children> <leafNode name="counters"> <properties> <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help> </properties> - <command>/usr/bin/vtysh -c "show bfd peers counters"</command> + <command>vtysh -c "show bfd peers counters"</command> </leafNode> </children> </node> @@ -27,16 +27,16 @@ <properties> <help>Show Bidirectional Forwarding Detection (BFD) peer status</help> <completionHelp> - <script>/usr/bin/vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script> + <script>vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("/usr/bin/vtysh -c \"show bfd " peer "\"") }'</command> + <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer "\"") }'</command> <children> <leafNode name="counters"> <properties> <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help> </properties> - <command>/usr/bin/vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("/usr/bin/vtysh -c \"show bfd " peer " counters\"") }'</command> + <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer " counters\"") }'</command> </leafNode> </children> </tagNode> @@ -44,7 +44,7 @@ <properties> <help>Show Bidirectional Forwarding Detection (BFD) peers brief</help> </properties> - <command>/usr/bin/vtysh -c "show bfd peers brief"</command> + <command>vtysh -c "show bfd peers brief"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-protocols-static.xml b/op-mode-definitions/show-protocols-static.xml.in index aaf875072..aaf875072 100644 --- a/op-mode-definitions/show-protocols-static.xml +++ b/op-mode-definitions/show-protocols-static.xml.in diff --git a/op-mode-definitions/show-raid.xml b/op-mode-definitions/show-raid.xml.in index 8bf394552..8bf394552 100644 --- a/op-mode-definitions/show-raid.xml +++ b/op-mode-definitions/show-raid.xml.in diff --git a/op-mode-definitions/show-reboot.xml b/op-mode-definitions/show-reboot.xml.in index c85966bcb..c85966bcb 100644 --- a/op-mode-definitions/show-reboot.xml +++ b/op-mode-definitions/show-reboot.xml.in diff --git a/op-mode-definitions/show-route-map.xml b/op-mode-definitions/show-route-map.xml.in index 0e376757b..633b2a4cb 100644 --- a/op-mode-definitions/show-route-map.xml +++ b/op-mode-definitions/show-route-map.xml.in @@ -6,7 +6,7 @@ <properties> <help>Show route-map information</help> </properties> - <command>/usr/bin/vtysh -c "show route-map"</command> + <command>vtysh -c "show route-map"</command> </node> <tagNode name="route-map"> <properties> @@ -15,7 +15,7 @@ <path>policy route-map</path> </completionHelp> </properties> - <command>/usr/bin/vtysh -c "show route-map $3"</command> + <command>vtysh -c "show route-map $3"</command> </tagNode> </children> </node> diff --git a/op-mode-definitions/show-rpki.xml b/op-mode-definitions/show-rpki.xml.in index d68c3b862..f593e4803 100644 --- a/op-mode-definitions/show-rpki.xml +++ b/op-mode-definitions/show-rpki.xml.in @@ -11,19 +11,19 @@ <properties> <help>Show RPKI cache connections</help> </properties> - <command>/usr/bin/vtysh -c "show rpki cache-connection"</command> + <command>vtysh -c "show rpki cache-connection"</command> </leafNode> <leafNode name="cache-server"> <properties> <help>Show RPKI cache servers information</help> </properties> - <command>/usr/bin/vtysh -c "show rpki cache-server"</command> + <command>vtysh -c "show rpki cache-server"</command> </leafNode> <leafNode name="prefix-table"> <properties> <help>Show RPKI-validated prefixes</help> </properties> - <command>/usr/bin/vtysh -c "show rpki prefix-table"</command> + <command>vtysh -c "show rpki prefix-table"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-system.xml b/op-mode-definitions/show-system.xml.in index 0623e3b62..5e9bf719e 100644 --- a/op-mode-definitions/show-system.xml +++ b/op-mode-definitions/show-system.xml.in @@ -128,7 +128,7 @@ <properties> <help>Show memory usage of all routing protocols</help> </properties> - <command>/usr/bin/vtysh -c "show memory"</command> + <command>vtysh -c "show memory"</command> </leafNode> </children> </node> @@ -162,7 +162,7 @@ <properties> <help>Show Quagga routing daemons</help> </properties> - <command>/usr/bin/vtysh -c "show daemons"</command> + <command>vtysh -c "show daemons"</command> </leafNode> <leafNode name="storage"> <properties> diff --git a/op-mode-definitions/show-table.xml b/op-mode-definitions/show-table.xml.in index b093a5de7..c7998e35d 100644 --- a/op-mode-definitions/show-table.xml +++ b/op-mode-definitions/show-table.xml.in @@ -6,7 +6,7 @@ <properties> <help>Show routing tables</help> </properties> - <command>/usr/bin/vtysh -c "show zebra router table summary"</command> + <command>vtysh -c "show zebra router table summary"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-users.xml b/op-mode-definitions/show-users.xml.in index a026e47e7..a026e47e7 100644 --- a/op-mode-definitions/show-users.xml +++ b/op-mode-definitions/show-users.xml.in diff --git a/op-mode-definitions/show-version.xml b/op-mode-definitions/show-version.xml.in index 2202d27b3..6bc49b8cf 100644 --- a/op-mode-definitions/show-version.xml +++ b/op-mode-definitions/show-version.xml.in @@ -18,13 +18,13 @@ <properties> <help>Show system version and versions of all packages</help> </properties> - <command>echo "Package versions:"; dpkg -l | awk '$0~/>/{exit}1'</command> + <command>echo "Package versions:"; dpkg -l | cat</command> </leafNode> <leafNode name="frr"> <properties> <help>Show Quagga version information</help> </properties> - <command>/usr/bin/vtysh -c "show version"</command> + <command>vtysh -c "show version"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-vpn.xml b/op-mode-definitions/show-vpn.xml.in index 0e7fc38e9..3fbc74ad1 100644 --- a/op-mode-definitions/show-vpn.xml +++ b/op-mode-definitions/show-vpn.xml.in @@ -11,7 +11,7 @@ <properties> <help>Show active VPN server sessions</help> </properties> - <command>${vyos_op_scripts_dir}/show_vpn_ra.py</command> + <command>${vyos_op_scripts_dir}/show_vpn_ra.py</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-vrf.xml b/op-mode-definitions/show-vrf.xml.in index 438e7c334..438e7c334 100644 --- a/op-mode-definitions/show-vrf.xml +++ b/op-mode-definitions/show-vrf.xml.in diff --git a/op-mode-definitions/show-zebra.xml.in b/op-mode-definitions/show-zebra.xml.in new file mode 100644 index 000000000..b0ad37f49 --- /dev/null +++ b/op-mode-definitions/show-zebra.xml.in @@ -0,0 +1,54 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="zebra"> + <properties> + <help>Zebra routing information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + <node name="client"> + <properties> + <help>Client information </help> + </properties> + <children> + <node name="summary"> + <properties> + <help>Brief Summary</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </node> + </children> + </node> + <node name="dplane"> + <properties> + <help>Zebra dataplane information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </node> + <node name="router"> + <properties> + <help>Zebra Router Information</help> + </properties> + <children> + <node name="table"> + <properties> + <help>Table Information about this Zebra Router</help> + </properties> + <children> + <node name="summary"> + <properties> + <help>Summary Information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </node> + </children> + </node> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/snmp.xml b/op-mode-definitions/snmp.xml.in index a0a47da40..a0a47da40 100644 --- a/op-mode-definitions/snmp.xml +++ b/op-mode-definitions/snmp.xml.in diff --git a/op-mode-definitions/sstp-server.xml b/op-mode-definitions/sstp-server.xml.in index 03dfc4262..03dfc4262 100644 --- a/op-mode-definitions/sstp-server.xml +++ b/op-mode-definitions/sstp-server.xml.in diff --git a/op-mode-definitions/telnet.xml b/op-mode-definitions/telnet.xml.in index c5bb6d283..c5bb6d283 100644 --- a/op-mode-definitions/telnet.xml +++ b/op-mode-definitions/telnet.xml.in diff --git a/op-mode-definitions/terminal.xml b/op-mode-definitions/terminal.xml.in index 9c4e629cb..9c4e629cb 100644 --- a/op-mode-definitions/terminal.xml +++ b/op-mode-definitions/terminal.xml.in diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml.in index 1b619ed43..1b619ed43 100644 --- a/op-mode-definitions/traceroute.xml +++ b/op-mode-definitions/traceroute.xml.in diff --git a/op-mode-definitions/traffic-dump.xml b/op-mode-definitions/traffic-dump.xml.in index 6d86f7423..76e3ddce5 100644 --- a/op-mode-definitions/traffic-dump.xml +++ b/op-mode-definitions/traffic-dump.xml.in @@ -16,6 +16,34 @@ </completionHelp> </properties> <children> + <node name="verbose"> + <command>sudo tcpdump -vvv -ne -i $4</command> + <properties> + <help>Provide more detailed packets for each monitored traffic</help> + </properties> + <children> + <tagNode name="filter"> + <command>sudo tcpdump -vvv -ne -i $4 "${@:6}"</command> + <properties> + <help>Monitor traffic matching filter conditions</help> + </properties> + </tagNode> + <tagNode name="save"> + <command>sudo tcpdump -vvv -ne -i $4 -w $6</command> + <properties> + <help>Save traffic dump from an interface to a file</help> + </properties> + <children> + <tagNode name="filter"> + <command>sudo tcpdump -vvv -ne -i $4 -w $6 "${@:8}"</command> + <properties> + <help>Save a dump of traffic matching filter conditions to a file</help> + </properties> + </tagNode> + </children> + </tagNode> + </children> + </node> <tagNode name="filter"> <command>sudo tcpdump -n -i $4 "${@:6}"</command> <properties> diff --git a/op-mode-definitions/vrrp.xml b/op-mode-definitions/vrrp.xml.in index 856fb440d..34484c706 100644 --- a/op-mode-definitions/vrrp.xml +++ b/op-mode-definitions/vrrp.xml.in @@ -28,7 +28,7 @@ <children> <node name="vrrp"> <properties> - <help>Restart the VRRP (Virtual Router Redundancy Protocol) process</help> + <help>Restart VRRP (Virtual Router Redundancy Protocol) process</help> </properties> <command>sudo systemctl restart keepalived.service</command> </node> diff --git a/op-mode-definitions/wake-on-lan.xml b/op-mode-definitions/wake-on-lan.xml.in index 1a9b88596..1a9b88596 100644 --- a/op-mode-definitions/wake-on-lan.xml +++ b/op-mode-definitions/wake-on-lan.xml.in diff --git a/op-mode-definitions/webproxy.xml b/op-mode-definitions/webproxy.xml.in index f8ec8fb0a..f8ec8fb0a 100644 --- a/op-mode-definitions/webproxy.xml +++ b/op-mode-definitions/webproxy.xml.in diff --git a/op-mode-definitions/wireguard.xml b/op-mode-definitions/wireguard.xml.in index a7bfa36a3..4aee4b1ac 100644 --- a/op-mode-definitions/wireguard.xml +++ b/op-mode-definitions/wireguard.xml.in @@ -1,28 +1,28 @@ <?xml version="1.0"?> -<!-- wireguard key management --> +<!-- Wireguard key management --> <interfaceDefinition> <node name="generate"> <children> <node name="wireguard"> <properties> - <help>wireguard key generation utility</help> + <help>Generate Wireguard keys</help> </properties> <children> <leafNode name="default-keypair"> <properties> - <help>generates the wireguard default-keypair</help> + <help>Generate the default Wireguard keypair</help> </properties> <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey</command> </leafNode> <leafNode name="preshared-key"> <properties> - <help>generate a wireguard preshared key</help> + <help>Generate a Wireguard preshared key</help> </properties> <command>${vyos_op_scripts_dir}/wireguard.py --genpsk</command> </leafNode> <tagNode name="named-keypairs"> <properties> - <help>Generates named wireguard keypairs</help> + <help>Generate specified Wireguard keypairs</help> </properties> <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey --location "$4"</command> </tagNode> @@ -34,17 +34,17 @@ <children> <node name="wireguard"> <properties> - <help>Show wireguard properties</help> + <help>Show Wireguard properties</help> </properties> <children> <node name="keypairs"> <properties> - <help>Shows named wireguard keys</help> + <help>Show Wireguard keys</help> </properties> <children> <tagNode name="pubkey"> <properties> - <help>Show wireguard private named key</help> + <help>Show specified Wireguard public key</help> <completionHelp> <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script> </completionHelp> @@ -53,7 +53,7 @@ </tagNode> <tagNode name="privkey"> <properties> - <help>Show wireguard public named key</help> + <help>Show specified Wireguard private key</help> <completionHelp> <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script> </completionHelp> @@ -68,7 +68,7 @@ <children> <tagNode name="wireguard"> <properties> - <help>show wireguard interface information</help> + <help>Show Wireguard interface information</help> <completionHelp> <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script> </completionHelp> @@ -77,19 +77,19 @@ <children> <leafNode name="allowed-ips"> <properties> - <help>show all allowed-ips for the specified interface</help> + <help>Show all IP addresses allowed for the specified interface</help> </properties> <command>sudo wg show "$4" allowed-ips</command> </leafNode> <leafNode name="endpoints"> <properties> - <help>show all endpoints for the specified interface</help> + <help>Show all endpoints for the specified interface</help> </properties> <command>sudo wg show "$4" endpoints</command> </leafNode> <leafNode name="peers"> <properties> - <help>show all peer IDs for the specified interface</help> + <help>Show all peer IDs for the specified interface</help> </properties> <command>sudo wg show "$4" peers</command> </leafNode> @@ -98,13 +98,13 @@ </tagNode> <node name="wireguard"> <properties> - <help>Show wireguard interface information</help> + <help>Show Wireguard interface information</help> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show-brief</command> <children> <leafNode name="detail"> <properties> - <help>Show detailed wireguard interface information</help> + <help>Show detailed Wireguard interface information</help> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show</command> </leafNode> @@ -118,12 +118,12 @@ <children> <node name="wireguard"> <properties> - <help>Delete wireguard properties</help> + <help>Delete Wireguard properties</help> </properties> <children> <tagNode name="keypair"> <properties> - <help>Delete a wireguard keypair</help> + <help>Delete a Wireguard keypair</help> <completionHelp> <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script> </completionHelp> @@ -135,4 +135,3 @@ </children> </node> </interfaceDefinition> - diff --git a/op-mode-definitions/wireless.xml b/op-mode-definitions/wireless.xml.in index a3a9d1f55..a3a9d1f55 100644 --- a/op-mode-definitions/wireless.xml +++ b/op-mode-definitions/wireless.xml.in |