From edc64e7fb63757a3779df12945ecefca9c462952 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 25 Jun 2025 17:35:01 +0100 Subject: op-mode: T7560: add support for virtual tag nodes for cases when commands need both fixed and variable arguments --- op-mode-definitions/clear-ip.xml.in | 14 +- op-mode-definitions/clear-ipv6.xml.in | 14 +- op-mode-definitions/execute-port-scan.xml.in | 4 +- op-mode-definitions/firewall.xml.in | 58 +-- op-mode-definitions/include/bgp/afi-common.xml.i | 24 - .../include/bgp/afi-ipv4-ipv6-common.xml.i | 36 +- .../include/bgp/afi-ipv4-ipv6-flowspec.xml.i | 24 +- .../include/bgp/afi-ipv4-ipv6-vpn-rd.xml.i | 4 +- .../include/bgp/afi-ipv4-ipv6-vpn.xml.i | 24 +- op-mode-definitions/include/bgp/next-hop.xml.i | 24 +- .../include/bgp/show-bgp-common.xml.i | 83 ++-- .../include/bgp/show-ip-bgp-common.xml.i | 28 +- op-mode-definitions/include/isis-common.xml.i | 54 ++- op-mode-definitions/include/ospf/common.xml.i | 538 +++++++++------------ .../include/ospfv3/border-routers.xml.i | 18 +- op-mode-definitions/include/ospfv3/database.xml.i | 54 +-- op-mode-definitions/include/ospfv3/interface.xml.i | 90 ++-- .../include/ospfv3/linkstate-id-node-tag.xml.i | 4 +- op-mode-definitions/include/ospfv3/linkstate.xml.i | 4 +- op-mode-definitions/include/ospfv3/route.xml.i | 52 +- op-mode-definitions/include/show-route-table.xml.i | 7 +- op-mode-definitions/include/show-route-tag.xml.i | 7 +- .../vtysh-generic-interface-virtualTagNode.xml | 11 + op-mode-definitions/ipv4-route.xml.in | 10 +- op-mode-definitions/ipv6-route.xml.in | 10 +- op-mode-definitions/monitor-command.xml.in | 29 +- op-mode-definitions/monitor-protocol.xml.in | 20 +- op-mode-definitions/mtr.xml.in | 8 +- op-mode-definitions/openvpn.xml.in | 125 +++-- op-mode-definitions/ping.xml.in | 4 +- op-mode-definitions/pki.xml.in | 30 +- op-mode-definitions/reset-bgp.xml.in | 172 +++---- op-mode-definitions/reset-ip-bgp.xml.in | 46 +- op-mode-definitions/show-bridge.xml.in | 103 ++-- op-mode-definitions/show-evpn.xml.in | 71 +-- op-mode-definitions/show-history.xml.in | 21 +- op-mode-definitions/show-interfaces-bonding.xml.in | 117 +++-- op-mode-definitions/show-interfaces-bridge.xml.in | 40 +- op-mode-definitions/show-interfaces-dummy.xml.in | 40 +- .../show-interfaces-ethernet.xml.in | 131 +++-- op-mode-definitions/show-interfaces-geneve.xml.in | 38 +- op-mode-definitions/show-interfaces-input.xml.in | 34 +- op-mode-definitions/show-interfaces-l2tpv3.xml.in | 38 +- .../show-interfaces-loopback.xml.in | 38 +- op-mode-definitions/show-interfaces-macsec.xml.in | 26 +- op-mode-definitions/show-interfaces-pppoe.xml.in | 56 +-- .../show-interfaces-pseudo-ethernet.xml.in | 40 +- op-mode-definitions/show-interfaces-sstpc.xml.in | 56 +-- op-mode-definitions/show-interfaces-tunnel.xml.in | 40 +- .../show-interfaces-virtual-ethernet.xml.in | 38 +- op-mode-definitions/show-interfaces-vti.xml.in | 38 +- op-mode-definitions/show-interfaces-vxlan.xml.in | 38 +- .../show-interfaces-wireguard.xml.in | 84 ++-- .../show-interfaces-wireless.xml.in | 90 ++-- op-mode-definitions/show-interfaces-wwan.xml.in | 160 +++--- op-mode-definitions/show-interfaces.xml.in | 44 +- op-mode-definitions/show-ip-bgp.xml.in | 10 +- op-mode-definitions/show-ip-route.xml.in | 56 +-- op-mode-definitions/show-ipv6-prefix-list.xml.in | 90 ++-- op-mode-definitions/show-ipv6-route.xml.in | 56 +-- op-mode-definitions/show-log.xml.in | 30 +- op-mode-definitions/show-mpls.xml.in | 80 +-- op-mode-definitions/show-openfabric.xml.in | 2 +- op-mode-definitions/show-vrf.xml.in | 46 +- op-mode-definitions/terminal.xml.in | 10 +- op-mode-definitions/traceroute.xml.in | 4 +- op-mode-definitions/traffic-dump.xml.in | 4 +- op-mode-definitions/vrrp.xml.in | 38 +- schema/op-mode-definition.rnc | 13 +- schema/op-mode-definition.rng | 54 ++- scripts/build-command-op-templates | 33 +- 71 files changed, 1747 insertions(+), 1790 deletions(-) create mode 100644 op-mode-definitions/include/vtysh-generic-interface-virtualTagNode.xml diff --git a/op-mode-definitions/clear-ip.xml.in b/op-mode-definitions/clear-ip.xml.in index 3c75ed11b..cbbd462d1 100644 --- a/op-mode-definitions/clear-ip.xml.in +++ b/op-mode-definitions/clear-ip.xml.in @@ -7,12 +7,6 @@ Clear Internet Protocol (IP) statistics or status - - - Clear prefix-list statistics or status - - vtysh -c "$*" - Clear prefix-list statistics or status for specified word @@ -20,9 +14,13 @@ <WORD> + + Clear prefix-list statistics or status + vtysh -c "$*" + vtysh -c "$*" - + Clear prefix-list statistics or status for given word|network @@ -30,7 +28,7 @@ vtysh -c "$*" - + diff --git a/op-mode-definitions/clear-ipv6.xml.in b/op-mode-definitions/clear-ipv6.xml.in index c062102fc..bdfc9eab7 100644 --- a/op-mode-definitions/clear-ipv6.xml.in +++ b/op-mode-definitions/clear-ipv6.xml.in @@ -7,12 +7,6 @@ Clear Internet Protocol (IPv6) statistics or status - - - Clear prefix-list statistics or status - - vtysh -c "$*" - Clear prefix-list statistics or status for specified word @@ -20,9 +14,13 @@ WORD + + Clear prefix-list statistics or status + vtysh -c "$*" + vtysh -c "$*" - + Clear prefix-list statistics or status for given word|network @@ -30,7 +28,7 @@ vtysh -c "$*" - + diff --git a/op-mode-definitions/execute-port-scan.xml.in b/op-mode-definitions/execute-port-scan.xml.in index 52cdab5f0..45221cb4c 100644 --- a/op-mode-definitions/execute-port-scan.xml.in +++ b/op-mode-definitions/execute-port-scan.xml.in @@ -16,7 +16,7 @@ nmap -p- -T4 --max-retries=1 --host-timeout=30s "$4" - + Port scan options @@ -24,7 +24,7 @@ ${vyos_op_scripts_dir}/execute_port-scan.py "${@:4}" - + diff --git a/op-mode-definitions/firewall.xml.in b/op-mode-definitions/firewall.xml.in index f3f9d3ded..549935de9 100755 --- a/op-mode-definitions/firewall.xml.in +++ b/op-mode-definitions/firewall.xml.in @@ -7,43 +7,43 @@ Show firewall information - + Show firewall group - - firewall group address-group - firewall group network-group - firewall group port-group - firewall group domain-group - firewall group dynamic-group address-group - firewall group dynamic-group ipv6-address-group - firewall group interface-group - firewall group ipv6-address-group - firewall group ipv6-network-group - firewall group mac-group - firewall group network-group - firewall group port-group - firewall group remote-group - - + - Show list view of firewall groups + Show firewall group - firewall group detail + firewall group address-group + firewall group network-group + firewall group port-group + firewall group domain-group + firewall group dynamic-group address-group + firewall group dynamic-group ipv6-address-group + firewall group interface-group + firewall group ipv6-address-group + firewall group ipv6-network-group + firewall group mac-group + firewall group network-group + firewall group port-group + firewall group remote-group - ${vyos_op_scripts_dir}/firewall.py --action show_group --name $4 --detail $5 - - - ${vyos_op_scripts_dir}/firewall.py --action show_group --name $4 - - - - Show firewall group - - + + + + Show list view of firewall groups + + firewall group detail + + + ${vyos_op_scripts_dir}/firewall.py --action show_group --name $4 --detail $5 + + + ${vyos_op_scripts_dir}/firewall.py --action show_group --name $4 + Show list view of firewall group diff --git a/op-mode-definitions/include/bgp/afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i index acf20d950..e5a72f3b1 100644 --- a/op-mode-definitions/include/bgp/afi-common.xml.i +++ b/op-mode-definitions/include/bgp/afi-common.xml.i @@ -1,28 +1,4 @@ - - - Community number where AA and NN are (0-65535) - - AA:NN - - - - #include - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Display routes matching the large-communities - - AA:BB:CC - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - Display routes matching the large-community-list 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 index d5fb7f5ee..86cd27517 100644 --- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i +++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i @@ -4,6 +4,18 @@ Display routes matching the community + + + Community number where AA and NN are (0-65535) + + AA:NN + + + + #include + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + Should accept local VPN route if exported and imported into different VRF (well-known community) @@ -142,13 +154,21 @@ Show BGP routes matching the specified large-communities ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Display routes matching the large-communities + + AA:BB:CC + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + + - - - Detailed information on TCP and BGP neighbor connections - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - Show BGP information for specified neighbor @@ -156,6 +176,10 @@ + + Detailed information on TCP and BGP neighbor connections + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ #include diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i index 34228fdd1..996e2bd3d 100644 --- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i +++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-flowspec.xml.i @@ -1,16 +1,4 @@ - - - Network in the BGP routing table to display - - <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> - - - - #include - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - Flowspec Address Family modifier @@ -19,6 +7,18 @@ #include #include #include + + + Network in the BGP routing table to display + + <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> + + + + #include + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn-rd.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn-rd.xml.i index bb95ce3f5..493207f5e 100644 --- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn-rd.xml.i +++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn-rd.xml.i @@ -8,7 +8,7 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + Show IP routes of specified prefix @@ -16,7 +16,7 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i index a9fb6e255..f106b8725 100644 --- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i +++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i @@ -1,16 +1,4 @@ - - - Network in the BGP routing table to display - - <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> - - - - #include - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - VPN Address Family modifier @@ -19,6 +7,18 @@ #include #include #include + + + Network in the BGP routing table to display + + <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> + + + + #include + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ diff --git a/op-mode-definitions/include/bgp/next-hop.xml.i b/op-mode-definitions/include/bgp/next-hop.xml.i index 517a44888..23f07e135 100644 --- a/op-mode-definitions/include/bgp/next-hop.xml.i +++ b/op-mode-definitions/include/bgp/next-hop.xml.i @@ -5,19 +5,19 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + IPv4/IPv6 nexthop address + + <x.x.x.x> <h:h:h:h:h:h:h:h> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + #include - - - IPv4/IPv6 nexthop address - - <x.x.x.x> <h:h:h:h:h:h:h:h> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - diff --git a/op-mode-definitions/include/bgp/show-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-bgp-common.xml.i index 003451a33..0e488d65f 100644 --- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i +++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i @@ -1,23 +1,23 @@ #include #include - - - Network in the BGP routing table to display - - <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> - - - - #include - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - IPv4 Address Family + + + Network in the BGP routing table to display + + <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> + + + + #include + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + #include #include #include @@ -25,23 +25,23 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Network in the BGP routing table to display - - <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> - - - - #include - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - IPv6 Address Family + + + Network in the BGP routing table to display + + <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> + + + + #include + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + #include #include #include @@ -53,21 +53,21 @@ Layer 2 Virtual Private Network - - - Network in the BGP routing table to display - - <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> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - Ethernet Virtual Private Network ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + Network in the BGP routing table to display + + <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> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + #include @@ -188,13 +188,20 @@ #include - #include - + - VXLAN network identifier (VNI) + VXLAN network identifier (VNI) number + + <1-16777215> + + - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + + VXLAN network identifier (VNI) + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" + diff --git a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i index 48475e04e..bb62fd1bb 100644 --- a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i +++ b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i @@ -37,18 +37,21 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Display only routes with non-natural netmasks + Show BGP information for specified IP address or prefix + + <x.x.x.x> <x.x.x.x/x> + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + + - Show BGP routes matching the communities + Display only routes with non-natural netmasks ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + Display routes matching the specified communities @@ -56,6 +59,10 @@ <AA:NN> local-AS no-advertise no-export + + Show BGP routes matching the communities + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ @@ -123,15 +130,6 @@ - - - Show BGP information for specified IP address or prefix - - <x.x.x.x> <x.x.x.x/x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - diff --git a/op-mode-definitions/include/isis-common.xml.i b/op-mode-definitions/include/isis-common.xml.i index 493a56633..cda46736d 100644 --- a/op-mode-definitions/include/isis-common.xml.i +++ b/op-mode-definitions/include/isis-common.xml.i @@ -4,19 +4,19 @@ Show IS-IS link state database + + + Show IS-IS link state database PDU + + lsp-id detail + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + #include ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show IS-IS link state database PDU - - lsp-id detail - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - Show IS-IS fast reroute/loop free alternate (lfa) information @@ -59,10 +59,10 @@ #include + #include ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ -#include Show MPLS information @@ -82,13 +82,19 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show interface information + Show information about specific interface + + + + + Show interface information + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include + @@ -96,19 +102,19 @@ Show IS-IS neighbor adjacencies + + + Show specific IS-IS neighbor adjacency + + system-id + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + #include ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show specific IS-IS neighbor adjacency - - system-id - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - Show IS-IS routing table @@ -180,4 +186,4 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - \ No newline at end of file + diff --git a/op-mode-definitions/include/ospf/common.xml.i b/op-mode-definitions/include/ospf/common.xml.i index 684073cc5..1ffe246e4 100644 --- a/op-mode-definitions/include/ospf/common.xml.i +++ b/op-mode-definitions/include/ospf/common.xml.i @@ -17,106 +17,86 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF ASBR summary database for given address of advertised router + Show IPv4 OSPF ASBR summary database information of given address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF ASBR summary database for given address of advertised router - - - - - - - Show IPv4 OSPF ASBR summary database information of given address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF ASBR summary database of given address for given advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show summary of self-originate IPv4 OSPF ASBR database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF ASBR summary database of given address for given advertised router + Show IPv4 OSPF ASBR summary database for given address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show summary of self-originate IPv4 OSPF ASBR database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF external database ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF external database for specified IP address of advertised router + Show IPv4 OSPF external database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF external database for specified IP address of advertised router - - - - - - - Show IPv4 OSPF external database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF external database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF external database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF external database of specified IP address for specified advertised router + Show IPv4 OSPF external database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF external database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF max-age database @@ -129,318 +109,258 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF network database for specified IP address of advertised router + Show IPv4 OSPF network database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF network database for given address of advertised router - - - - - - - Show IPv4 OSPF network database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF network database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF network database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF network database of specified IP address for specified advertised router + Show IPv4 OSPF network database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF network database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF NSSA external database ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF NSSA external database for specified IP address of advertised router + Show IPv4 OSPF NSSA external database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF NSSA external database for specified IP address of advertised router - - - - - - - Show IPv4 OSPF NSSA external database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF NSSA external database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF NSSA external database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF NSSA external database of specified IP address for specified advertised router + Show IPv4 OSPF NSSA external database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF NSSA external database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF opaque-area database ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF opaque-area database for specified IP address of advertised router + Show IPv4 OSPF opaque-area database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF opaque-area database for specified IP address of advertised router - - - - - - - Show IPv4 OSPF opaque-area database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF opaque-area database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF opaque-area database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF opaque-area database of specified IP address for specified advertised router + Show IPv4 OSPF opaque-area database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF opaque-area database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF opaque-as database ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF opaque-as database for specified IP address of advertised router + Show IPv4 OSPF opaque-as database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF opaque-as database for specified IP address of advertised router - - - - - - - Show IPv4 OSPF opaque-as database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF opaque-as database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF opaque-as database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF opaque-as database of specified IP address for specified advertised router + Show IPv4 OSPF opaque-as database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF opaque-as database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF opaque-link database ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF opaque-link database for specified IP address of advertised router + Show IPv4 OSPF opaque-link database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF opaque-link database for specified IP address of advertised router - - - - - - - Show IPv4 OSPF opaque-link database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF opaque-link database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF opaque-link database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF opaque-link database of specified IP address for specified advertised router + Show IPv4 OSPF opaque-link database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF opaque-link database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF router database ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF router database for specified IP address of advertised router + Show IPv4 OSPF router database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF router database for specified IP address of advertised router - - - - - - - Show IPv4 OSPF router database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF router database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF router database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF router database of specified IP address for specified advertised router + Show IPv4 OSPF router database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF router database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + Show IPv4 OSPF self-originate database @@ -453,63 +373,59 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show IPv4 OSPF summary database for specified IP address of advertised router + Show IPv4 OSPF summary database information of specified IP address - <x.x.x.x> + <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show IPv4 OSPF summary database for specified IP address of advertised router - - - - - - - Show IPv4 OSPF summary database information of specified IP address - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show advertising router link states - - + + + + Show IPv4 OSPF summary database of specified IP address for specified advertised router + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show self-originate IPv4 OSPF summary database + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - Show IPv4 OSPF summary database of specified IP address for specified advertised router + Show IPv4 OSPF summary database for specified IP address of advertised router <x.x.x.x> ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - Show self-originate IPv4 OSPF summary database - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - + #include - + - Show IPv4 OSPF interface information + Show information about specific interface + + + + + Show IPv4 OSPF interface information + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - -#include + Show MPLS information @@ -524,19 +440,19 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + Show IPv4 OSPF neighbor information for specified IP address or interface + + <x.x.x.x> + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + #include - - - Show IPv4 OSPF neighbor information for specified IP address or interface - - <x.x.x.x> - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - Show IPv4 OSPF route information diff --git a/op-mode-definitions/include/ospfv3/border-routers.xml.i b/op-mode-definitions/include/ospfv3/border-routers.xml.i index e8827a2c4..4abd89e6b 100644 --- a/op-mode-definitions/include/ospfv3/border-routers.xml.i +++ b/op-mode-definitions/include/ospfv3/border-routers.xml.i @@ -5,16 +5,16 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + Border router ID + + <x.x.x.x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + #include - - - Border router ID - - <x.x.x.x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - diff --git a/op-mode-definitions/include/ospfv3/database.xml.i b/op-mode-definitions/include/ospfv3/database.xml.i index fdc45f184..d4e7ab695 100644 --- a/op-mode-definitions/include/ospfv3/database.xml.i +++ b/op-mode-definitions/include/ospfv3/database.xml.i @@ -21,7 +21,7 @@ Search by Any Link state Type - + Search by Link state ID @@ -32,31 +32,32 @@ #include #include #include + #include - + - - - Search by Link state ID - - <x.x.x.x> - - - vtysh -c "show ipv6 ospf6 database * $6" - - #include - #include - #include - #include - - Show AS-External LSAs ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + Search by Advertising Router IDs + + <x.x.x.x> + + + + #include + #include + #include + #include + #include + + #include @@ -79,21 +80,6 @@ #include - - - Search by Advertising Router IDs - - <x.x.x.x> - - - - #include - #include - #include - #include - #include - - #include #include #include @@ -188,7 +174,7 @@ #include - + Show LSAs @@ -202,7 +188,7 @@ #include #include - + Show router LSAs diff --git a/op-mode-definitions/include/ospfv3/interface.xml.i b/op-mode-definitions/include/ospfv3/interface.xml.i index 45d5dbd45..a918651cf 100644 --- a/op-mode-definitions/include/ospfv3/interface.xml.i +++ b/op-mode-definitions/include/ospfv3/interface.xml.i @@ -5,71 +5,71 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - Show connected prefixes to advertise - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - - - - Show interface prefix route specific information + Specific insterface to examine - <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - #include - + - Matched interface prefix information + Show connected prefixes to advertise ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show interface prefix route specific information + + <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + + Matched interface prefix information + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + #include + - - - - - - Specific insterface to examine - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + Show connected prefixes to advertise ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - #include - - - - - Show interface prefix route specific information - - <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - + - Matched interface prefix information + Show interface prefix route specific information + + <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + + #include + + + Matched interface prefix information + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + #include - + - + 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 index 66674e754..b5aed4c0a 100644 --- a/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i +++ b/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i @@ -1,5 +1,5 @@ - + Search by Link state ID @@ -13,5 +13,5 @@ #include #include - + diff --git a/op-mode-definitions/include/ospfv3/linkstate.xml.i b/op-mode-definitions/include/ospfv3/linkstate.xml.i index 030dc7923..3a08d748f 100644 --- a/op-mode-definitions/include/ospfv3/linkstate.xml.i +++ b/op-mode-definitions/include/ospfv3/linkstate.xml.i @@ -13,7 +13,7 @@ - + Specify Link state ID as IPv4 address notation @@ -21,7 +21,7 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + diff --git a/op-mode-definitions/include/ospfv3/route.xml.i b/op-mode-definitions/include/ospfv3/route.xml.i index a5b97cd05..0128bac1b 100644 --- a/op-mode-definitions/include/ospfv3/route.xml.i +++ b/op-mode-definitions/include/ospfv3/route.xml.i @@ -5,6 +5,32 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + Show specified route/prefix information + + <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show routes longer than specified prefix + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show routes matching specified prefix + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + + + Show Type-1 External route information @@ -50,30 +76,4 @@ - - - Show specified route/prefix information - - <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show routes longer than specified prefix - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show routes matching specified prefix - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - - - diff --git a/op-mode-definitions/include/show-route-table.xml.i b/op-mode-definitions/include/show-route-table.xml.i index c3cf82a86..7c0f574c8 100644 --- a/op-mode-definitions/include/show-route-table.xml.i +++ b/op-mode-definitions/include/show-route-table.xml.i @@ -1,12 +1,7 @@ - - - Table to display - - - The table number to display + Show routes in specific routing table all protocols static table diff --git a/op-mode-definitions/include/show-route-tag.xml.i b/op-mode-definitions/include/show-route-tag.xml.i index 8bfa0ae4e..c7279e82e 100644 --- a/op-mode-definitions/include/show-route-tag.xml.i +++ b/op-mode-definitions/include/show-route-tag.xml.i @@ -1,12 +1,7 @@ - - - Show only routes with tag - - - Tag value + Show route with given tag <1-4294967295> diff --git a/op-mode-definitions/include/vtysh-generic-interface-virtualTagNode.xml b/op-mode-definitions/include/vtysh-generic-interface-virtualTagNode.xml new file mode 100644 index 000000000..1dfcfc75e --- /dev/null +++ b/op-mode-definitions/include/vtysh-generic-interface-virtualTagNode.xml @@ -0,0 +1,11 @@ + + + + Show information about specific interface + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + diff --git a/op-mode-definitions/ipv4-route.xml.in b/op-mode-definitions/ipv4-route.xml.in index e4dda2851..41a4b62ba 100644 --- a/op-mode-definitions/ipv4-route.xml.in +++ b/op-mode-definitions/ipv4-route.xml.in @@ -63,12 +63,6 @@ Reset IP route - - - Flush the kernel route cache - - ip route flush cache - Flush the kernel route cache for a given route @@ -76,6 +70,10 @@ <x.x.x.x> <x.x.x.x/x> + + Flush the kernel route cache + ip route flush cache + ip route flush cache "$5" diff --git a/op-mode-definitions/ipv6-route.xml.in b/op-mode-definitions/ipv6-route.xml.in index 311bc6de6..7ea5a13f6 100644 --- a/op-mode-definitions/ipv6-route.xml.in +++ b/op-mode-definitions/ipv6-route.xml.in @@ -83,12 +83,6 @@ Reset IPv6 route - - - Flush the kernel IPv6 route cache - - ip -f inet6 route flush cache - Flush the kernel IPv6 route cache for a given route @@ -96,6 +90,10 @@ <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + + Flush the kernel IPv6 route cache + ip -f inet6 route flush cache + ip -f inet6 route flush cache "$5" diff --git a/op-mode-definitions/monitor-command.xml.in b/op-mode-definitions/monitor-command.xml.in index 31c68f029..ba242386e 100644 --- a/op-mode-definitions/monitor-command.xml.in +++ b/op-mode-definitions/monitor-command.xml.in @@ -2,26 +2,31 @@ - + - Monitor operational mode command (refreshes every 2 seconds) + Monitor operational mode command output - watch --no-title ${vyos_op_scripts_dir}/vyos-op-cmd-wrapper.sh ${@:3} - - + + + Monitor operational mode command (refreshes every 2 seconds) + + watch --no-title ${vyos_op_scripts_dir}/vyos-op-cmd-wrapper.sh ${@:3} + Show differences during each run + + + + Monitor operational mode command (refreshes every 2 seconds) + + watch --no-title --differences ${vyos_op_scripts_dir}/vyos-op-cmd-wrapper.sh ${@:4} + + - - - Monitor operational mode command (refreshes every 2 seconds) - - watch --no-title --differences ${vyos_op_scripts_dir}/vyos-op-cmd-wrapper.sh ${@:4} - - + diff --git a/op-mode-definitions/monitor-protocol.xml.in b/op-mode-definitions/monitor-protocol.xml.in index f05a1945f..fec30c8a5 100644 --- a/op-mode-definitions/monitor-protocol.xml.in +++ b/op-mode-definitions/monitor-protocol.xml.in @@ -35,12 +35,6 @@ vtysh -c "no debug bgp ${@:5}" - - - Disable BGP allow best path debugging - - vtysh -c "no debug bgp ${@:5}" - Disable BGP bestpath IPv4 IPv6 @@ -48,6 +42,10 @@ <x.x.x.x/x> <h:h:h:h:h:h:h:h/h> + + Disable BGP allow best path debugging + vtysh -c "no debug bgp ${@:5}" + vtysh -c "no debug bgp ${@:5}" @@ -155,12 +153,6 @@ vtysh -c "debug bgp ${@:5}" - - - Enable BGP allow best path debugging - - vtysh -c "debug bgp ${@:5}" - Debug bestpath IPv4 IPv6 @@ -168,6 +160,10 @@ <x.x.x.x/x> <h:h:h:h:h:h:h:h/h> + + Enable BGP allow best path debugging + vtysh -c "debug bgp ${@:5}" + vtysh -c "debug bgp ${@:5}" diff --git a/op-mode-definitions/mtr.xml.in b/op-mode-definitions/mtr.xml.in index 66729e2bc..ac146d520 100644 --- a/op-mode-definitions/mtr.xml.in +++ b/op-mode-definitions/mtr.xml.in @@ -11,7 +11,7 @@ ${vyos_op_scripts_dir}/mtr.py ${@:3} - + Traceroute options @@ -19,7 +19,7 @@ ${vyos_op_scripts_dir}/mtr.py ${@:3} - + @@ -33,7 +33,7 @@ ${vyos_op_scripts_dir}/mtr.py ${@:2} - + mtr options @@ -41,7 +41,7 @@ ${vyos_op_scripts_dir}/mtr.py ${@:2} - + diff --git a/op-mode-definitions/openvpn.xml.in b/op-mode-definitions/openvpn.xml.in index 63834a127..692eef836 100644 --- a/op-mode-definitions/openvpn.xml.in +++ b/op-mode-definitions/openvpn.xml.in @@ -39,91 +39,84 @@ ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=openvpn + + + Show tunnel status for OpenVPN client interfaces + + ${vyos_op_scripts_dir}/openvpn.py show --mode client + + + + Show tunnel status for OpenVPN server interfaces + + ${vyos_op_scripts_dir}/openvpn.py show --mode server + + + + Show tunnel status for OpenVPN site-to-site interfaces + + ${vyos_op_scripts_dir}/openvpn.py show --mode site_to_site + Show detailed OpenVPN interface information ${vyos_op_scripts_dir}/interfaces.py show --intf-type=openvpn - - - - - Show OpenVPN interface information - - - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name=$4 - - + - Show OpenVPN interface users + Show OpenVPN interface information - + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name=$4 - + - Show multi-factor authentication information + Show OpenVPN interface users + + + - + - Show multi-factor authentication secret + Show multi-factor authentication information - ${vyos_op_scripts_dir}/show_openvpn_mfa.py --user="$6" --intf="$4" --action=secret - - - - Show multi-factor authentication otpauth uri - - ${vyos_op_scripts_dir}/show_openvpn_mfa.py --user="$6" --intf="$4" --action=uri - - - - Show multi-factor authentication QR code - - ${vyos_op_scripts_dir}/show_openvpn_mfa.py --user="$6" --intf="$4" --action=qrcode - + + + + Show multi-factor authentication secret + + ${vyos_op_scripts_dir}/show_openvpn_mfa.py --user="$6" --intf="$4" --action=secret + + + + Show multi-factor authentication otpauth uri + + ${vyos_op_scripts_dir}/show_openvpn_mfa.py --user="$6" --intf="$4" --action=uri + + + + Show multi-factor authentication QR code + + ${vyos_op_scripts_dir}/show_openvpn_mfa.py --user="$6" --intf="$4" --action=qrcode + + + - + + + + Show summary of specified OpenVPN interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" + - - - - Show summary of specified OpenVPN interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" - + - - - - - - Show OpenVPN information - - - - - Show tunnel status for OpenVPN client interfaces - - ${vyos_op_scripts_dir}/openvpn.py show --mode client - - - - Show tunnel status for OpenVPN server interfaces - - ${vyos_op_scripts_dir}/openvpn.py show --mode server - - - - Show tunnel status for OpenVPN site-to-site interfaces - - ${vyos_op_scripts_dir}/openvpn.py show --mode site_to_site - + diff --git a/op-mode-definitions/ping.xml.in b/op-mode-definitions/ping.xml.in index 4c25a59ab..fd50398ba 100644 --- a/op-mode-definitions/ping.xml.in +++ b/op-mode-definitions/ping.xml.in @@ -9,7 +9,7 @@ ${vyos_op_scripts_dir}/ping.py ${@:2} - + Ping options @@ -17,7 +17,7 @@ ${vyos_op_scripts_dir}/ping.py ${@:2} - + diff --git a/op-mode-definitions/pki.xml.in b/op-mode-definitions/pki.xml.in index 542b15e9d..29b08dacb 100644 --- a/op-mode-definitions/pki.xml.in +++ b/op-mode-definitions/pki.xml.in @@ -492,12 +492,6 @@ ${vyos_op_scripts_dir}/pki.py show_all - - - Show x509 CA certificates - - ${vyos_op_scripts_dir}/pki.py show_certificate_authority - Show x509 CA certificate by name @@ -505,6 +499,10 @@ pki ca + + Show x509 CA certificates + ${vyos_op_scripts_dir}/pki.py show_certificate_authority + ${vyos_op_scripts_dir}/pki.py show_certificate_authority --name "$4" @@ -515,12 +513,6 @@ - - - Show x509 certificates - - ${vyos_op_scripts_dir}/pki.py show_certificate - Show x509 certificate by name @@ -528,6 +520,10 @@ pki certificate + + Show x509 certificates + ${vyos_op_scripts_dir}/pki.py show_certificate + ${vyos_op_scripts_dir}/pki.py show_certificate --name "$4" @@ -547,12 +543,6 @@ - - - Show x509 certificate revocation lists - - ${vyos_op_scripts_dir}/pki.py show_crl - Show x509 certificate revocation lists by CA name @@ -560,6 +550,10 @@ pki ca + + Show x509 certificate revocation lists + ${vyos_op_scripts_dir}/pki.py show_crl + ${vyos_op_scripts_dir}/pki.py show_crl --name "$4" diff --git a/op-mode-definitions/reset-bgp.xml.in b/op-mode-definitions/reset-bgp.xml.in index a1d42d4a3..3d73fd417 100644 --- a/op-mode-definitions/reset-bgp.xml.in +++ b/op-mode-definitions/reset-bgp.xml.in @@ -7,6 +7,18 @@ Border Gateway Protocol (BGP) information + + + BGP IPv4/IPv6 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + Clear all peers @@ -37,20 +49,20 @@ #include #include + + + IPv4 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + - - - IPv4 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - IPv6 Address Family @@ -64,20 +76,20 @@ #include #include + + + IPv6 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + - - - IPv6 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - Layer 2 Virtual Private Network Address Family @@ -96,20 +108,20 @@ #include #include + + + BGP IPv4/IPv6 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + - - - BGP IPv4/IPv6 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - @@ -120,7 +132,7 @@ - + IPv4/IPv6 neighbor to clear @@ -131,7 +143,7 @@ #include - + Clear all peers @@ -162,20 +174,20 @@ #include #include + + + IPv4 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + - - - IPv4 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - IPv6 Address Family @@ -189,20 +201,20 @@ #include #include + + + IPv6 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + - - - IPv6 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - Layer 2 Virtual Private Network Address Family @@ -221,38 +233,26 @@ #include #include + + + BGP IPv4/IPv6 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + - - - BGP IPv4/IPv6 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - - - - BGP IPv4/IPv6 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - diff --git a/op-mode-definitions/reset-ip-bgp.xml.in b/op-mode-definitions/reset-ip-bgp.xml.in index 34a4503d9..9201865dc 100644 --- a/op-mode-definitions/reset-ip-bgp.xml.in +++ b/op-mode-definitions/reset-ip-bgp.xml.in @@ -9,28 +9,38 @@ Border Gateway Protocol (BGP) information + + + BGP IPv4/IPv6 neighbor to clear + + + + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + #include + + Clear all BGP peering sessions vtysh -c "clear bgp ipv4 *" - - - Clear BGP route flap dampening information - - vtysh -c "clear ip bgp dampening" - - Clear BGP route flap dampening information for given host|network address + Clear BGP route flap dampening information for given host ornetwork address <x.x.x.x> <x.x.x.x/x> + + Clear BGP route flap dampening information + vtysh -c "clear ip bgp dampening" + vtysh -c "clear ip bgp dampening $5" - + Clear BGP route flap dampening information for given network address @@ -38,7 +48,7 @@ vtysh -c "clear ip bgp dampening $5 $6" - + #include @@ -57,7 +67,7 @@ vtysh -c "clear bgp vrf $5 *" - + Clear BGP neighbor IP address @@ -65,24 +75,12 @@ vtysh -c "clear bgp vrf $5 $6" - + - - - BGP IPv4/IPv6 neighbor to clear - - - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - #include - - - + diff --git a/op-mode-definitions/show-bridge.xml.in b/op-mode-definitions/show-bridge.xml.in index 47c3d2e6e..c9558c315 100644 --- a/op-mode-definitions/show-bridge.xml.in +++ b/op-mode-definitions/show-bridge.xml.in @@ -6,7 +6,57 @@ Show bridging information + ${vyos_op_scripts_dir}/bridge.py show + + + Show bridge information for a given bridge interface + + + + + bridge -c link show | grep "master $3" + + + + View Spanning Tree info for specified bridges + + ${vyos_op_scripts_dir}/stp.py show_stp --ifname=$3 + + + + Show detailed Spanning Tree info for specified bridge + + ${vyos_op_scripts_dir}/stp.py show_stp --ifname=$3 --detail + + + + + + Displays the multicast group database for the bridge + + ${vyos_op_scripts_dir}/bridge.py show_mdb --interface=$3 + + + + Show the forwarding database of the bridge + + ${vyos_op_scripts_dir}/bridge.py show_fdb --interface=$3 + + + + Display bridge interface details + + ${vyos_op_scripts_dir}/bridge.py show_detail --interface=$3 + + + + Display bridge interface nexthop-group + + ${vyos_op_scripts_dir}/bridge.py show_detail --nexthop-group --interface=$3 + + + View Spanning Tree info for all bridges @@ -43,59 +93,6 @@ - - - Show bridge information for a given bridge interface - - - - - bridge -c link show | grep "master $3" - - Show bridge interface information - ${vyos_op_scripts_dir}/bridge.py show - - - - - View Spanning Tree info for specified bridges - - ${vyos_op_scripts_dir}/stp.py show_stp --ifname=$3 - - - - Show detailed Spanning Tree info for specified bridge - - ${vyos_op_scripts_dir}/stp.py show_stp --ifname=$3 --detail - - - - - - Displays the multicast group database for the bridge - - ${vyos_op_scripts_dir}/bridge.py show_mdb --interface=$3 - - - - Show the forwarding database of the bridge - - ${vyos_op_scripts_dir}/bridge.py show_fdb --interface=$3 - - - - Display bridge interface details - - ${vyos_op_scripts_dir}/bridge.py show_detail --interface=$3 - - - - Display bridge interface nexthop-group - - ${vyos_op_scripts_dir}/bridge.py show_detail --nexthop-group --interface=$3 - - - diff --git a/op-mode-definitions/show-evpn.xml.in b/op-mode-definitions/show-evpn.xml.in index 3c1e5c7d6..885e0e615 100644 --- a/op-mode-definitions/show-evpn.xml.in +++ b/op-mode-definitions/show-evpn.xml.in @@ -11,30 +11,30 @@ Access VLANs - - #include - - ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" - - - - Access VLANs interface name - - - - - - + + - VLAN ID + Access VLANs interface name - <1-4094> + - ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" - + + + + VLAN ID + + <1-4094> + + + ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" + + + + #include - + ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" + ARP and ND cache @@ -43,22 +43,22 @@ #include - - - Show ESI information for specified ESI - - <esi> - - - - ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" - Show ESI information ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" + + + Show ESI information for specified ESI + + <esi> + + + + ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" + Show ESI details @@ -106,13 +106,22 @@ #include - #include Show VNI information ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" - + + + + VXLAN network identifier (VNI) number + + <1-16777215> + + + + ${vyos_op_scripts_dir}/evpn.py show_evpn --command "$*" + Show VNI details diff --git a/op-mode-definitions/show-history.xml.in b/op-mode-definitions/show-history.xml.in index 7fb286264..1781fa267 100644 --- a/op-mode-definitions/show-history.xml.in +++ b/op-mode-definitions/show-history.xml.in @@ -14,18 +14,17 @@ HISTTIMEFORMAT='%FT%T%z ' HISTFILE="$HOME/.bash_history" \set -o history; history 20 + + + Show last N commands in history + + <NUMBER> + + + HISTTIMEFORMAT='%FT%T%z ' HISTFILE="$HOME/.bash_history" \set -o history; history $3 + - - - - Show last N commands in history - - <NUMBER> - - - HISTTIMEFORMAT='%FT%T%z ' HISTFILE="$HOME/.bash_history" \set -o history; history $3 - - + diff --git a/op-mode-definitions/show-interfaces-bonding.xml.in b/op-mode-definitions/show-interfaces-bonding.xml.in index 839a4cd91..58f754ad6 100644 --- a/op-mode-definitions/show-interfaces-bonding.xml.in +++ b/op-mode-definitions/show-interfaces-bonding.xml.in @@ -4,26 +4,17 @@ - + - Show specified Bonding interface information - - interfaces bonding - + Show specified bonding interface information ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=bonding - - - Show summary of the specified bonding interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=bonding - - Show detailed interface information + Show detailed bonding interface information - ${vyos_op_scripts_dir}/show_bonding_detail.sh "$4" + ${vyos_op_scripts_dir}/interfaces.py show --intf-type=bonding @@ -34,13 +25,7 @@ Show LACP details - ${vyos_op_scripts_dir}/bonding.py show_lacp_detail --interface="$4" - - - - Show LACP Neighbors - - ${vyos_op_scripts_dir}/bonding.py show_lacp_neighbors --interface="$4" + ${vyos_op_scripts_dir}/bonding.py show_lacp_detail @@ -48,59 +33,73 @@ Show specified bonding interface information - ${vyos_op_scripts_dir}/show-bond.py --interface "$4" + ${vyos_op_scripts_dir}/show-bond.py --slaves - + - Show specified virtual network interface (vif) information - interfaces bonding ${COMP_WORDS[3]} vif + interfaces bonding - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=bonding + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=bonding - Show summary of specified virtual network interface (vif) information + Show summary of the specified bonding interface information - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=bonding + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=bonding - - - #include - - - - - Show Bonding interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=bonding - - - - Show detailed bonding interface information - - ${vyos_op_scripts_dir}/interfaces.py show --intf-type=bonding - - - - Show LACP related info - - - Show LACP details + Show detailed interface information - ${vyos_op_scripts_dir}/bonding.py show_lacp_detail + ${vyos_op_scripts_dir}/show_bonding_detail.sh "$4" + + + + Show LACP related info + + + + + Show LACP details + + ${vyos_op_scripts_dir}/bonding.py show_lacp_detail --interface="$4" + + + + Show LACP Neighbors + + ${vyos_op_scripts_dir}/bonding.py show_lacp_neighbors --interface="$4" + + + + + + Show specified bonding interface information + + ${vyos_op_scripts_dir}/show-bond.py --interface "$4" + + + Show specified virtual network interface (vif) information + + interfaces bonding ${COMP_WORDS[3]} vif + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=bonding + + + + Show summary of specified virtual network interface (vif) information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=bonding + + + + #include - - - - Show specified bonding interface information - - ${vyos_op_scripts_dir}/show-bond.py --slaves - + diff --git a/op-mode-definitions/show-interfaces-bridge.xml.in b/op-mode-definitions/show-interfaces-bridge.xml.in index 998dacd38..f79b7bd7f 100644 --- a/op-mode-definitions/show-interfaces-bridge.xml.in +++ b/op-mode-definitions/show-interfaces-bridge.xml.in @@ -4,27 +4,9 @@ - + - Show specified Bridge interface information - - interfaces bridge - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=bridge - - - - Show summary of the specified bridge interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=bridge - - #include - - - - - Show Bridge interface information + Show bridge interface information ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=bridge @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=bridge + + + Show specified bridge interface information + + interfaces bridge + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=bridge + + + + Show summary of the specified bridge interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=bridge + + #include + + diff --git a/op-mode-definitions/show-interfaces-dummy.xml.in b/op-mode-definitions/show-interfaces-dummy.xml.in index 18f21e97e..fdffeb96b 100644 --- a/op-mode-definitions/show-interfaces-dummy.xml.in +++ b/op-mode-definitions/show-interfaces-dummy.xml.in @@ -4,27 +4,9 @@ - + - Show specified Dummy interface information - - interfaces dummy - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=dummy - - - - Show summary of the specified dummy interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=dummy - - #include - - - - - Show Dummy interface information + Show dummy interface information ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=dummy @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=dummy + + + Show specified dummy interface information + + interfaces dummy + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=dummy + + + + Show summary of the specified dummy interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=dummy + + #include + + diff --git a/op-mode-definitions/show-interfaces-ethernet.xml.in b/op-mode-definitions/show-interfaces-ethernet.xml.in index 8a23455bf..c6e9a2ec2 100644 --- a/op-mode-definitions/show-interfaces-ethernet.xml.in +++ b/op-mode-definitions/show-interfaces-ethernet.xml.in @@ -4,85 +4,84 @@ - + Show specified Ethernet interface information - - interfaces ethernet - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=ethernet - - - - Show summary of the specified ethernet interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=ethernet - - + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=ethernet + + - Visually identify specified ethernet interface + Show detailed ethernet interface information - echo "Blinking interface $4 for 30 seconds."; ethtool --identify "$4" 30 + ${vyos_op_scripts_dir}/interfaces.py show --intf-type=ethernet - - - Show physical device information for specified ethernet interface - - ethtool "$4"; ethtool --show-ring "$4"; ethtool --driver "$4" + + + + interfaces ethernet + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=ethernet - + - Show physical device offloading capabilities + Show summary of the specified ethernet interface information - ethtool --show-features "$4" | sed -e 1d -e '/fixed/d' -e 's/^\t*//g' -e 's/://' | column -t -s' ' + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=ethernet - - - - - Show physical device statistics for specified ethernet interface - - ethtool --statistics "$4" - - - - Show transceiver information from modules (e.g SFP+, QSFP) - - ethtool --module-info "$4" - - - - Show specified virtual network interface (vif) information - - interfaces ethernet ${COMP_WORDS[3]} vif - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=ethernet - - + - Show summary of specified virtual network interface (vif) information + Visually identify specified ethernet interface - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=ethernet + echo "Blinking interface $4 for 30 seconds."; ethtool --identify "$4" 30 + + + Show physical device information for specified ethernet interface + + ethtool "$4"; ethtool --show-ring "$4"; ethtool --driver "$4" + + + + Show physical device offloading capabilities + + ethtool --show-features "$4" | sed -e 1d -e '/fixed/d' -e 's/^\t*//g' -e 's/://' | column -t -s' ' + + + + + + Show physical device statistics for specified ethernet interface + + ethtool --statistics "$4" + + + + Show transceiver information from modules (e.g SFP+, QSFP) + + ethtool --module-info "$4" + + + + Show specified virtual network interface (vif) information + + interfaces ethernet ${COMP_WORDS[3]} vif + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=ethernet + + + + Show summary of specified virtual network interface (vif) information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=ethernet + + + + #include - - #include - - - - - Show Ethernet interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=ethernet - - - - Show detailed ethernet interface information - - ${vyos_op_scripts_dir}/interfaces.py show --intf-type=ethernet - + diff --git a/op-mode-definitions/show-interfaces-geneve.xml.in b/op-mode-definitions/show-interfaces-geneve.xml.in index b5fe84ca7..aaaa34757 100644 --- a/op-mode-definitions/show-interfaces-geneve.xml.in +++ b/op-mode-definitions/show-interfaces-geneve.xml.in @@ -4,25 +4,7 @@ - - - Show specified GENEVE interface information - - interfaces geneve - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=geneve - - - - Show summary of the specified GENEVE interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=geneve - - #include - - - + Show GENEVE interface information @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=geneve + + + Show specified GENEVE interface information + + interfaces geneve + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=geneve + + + + Show summary of the specified GENEVE interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=geneve + + #include + + diff --git a/op-mode-definitions/show-interfaces-input.xml.in b/op-mode-definitions/show-interfaces-input.xml.in index c9856f77f..705b94a1a 100644 --- a/op-mode-definitions/show-interfaces-input.xml.in +++ b/op-mode-definitions/show-interfaces-input.xml.in @@ -4,9 +4,23 @@ - + + + Show input (ifb) interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=input + + + + Show detailed input interface information + + ${vyos_op_scripts_dir}/interfaces.py show --intf-type=input + + + + - Show specified Input interface information + Show specified input interface information interfaces input @@ -21,21 +35,7 @@ #include - - - - Show Input (ifb) interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=input - - - - Show detailed input interface information - - ${vyos_op_scripts_dir}/interfaces.py show --intf-type=input - - - + diff --git a/op-mode-definitions/show-interfaces-l2tpv3.xml.in b/op-mode-definitions/show-interfaces-l2tpv3.xml.in index 88b73d7d7..3d0345001 100644 --- a/op-mode-definitions/show-interfaces-l2tpv3.xml.in +++ b/op-mode-definitions/show-interfaces-l2tpv3.xml.in @@ -4,25 +4,7 @@ - - - Show specified L2TPv3 interface information - - interfaces l2tpv3 - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=l2tpv3 - - - - Show summary of the specified L2TPv3 interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=l2tpv3 - - #include - - - + Show L2TPv3 interface information @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=l2tpv3 + + + Show specified L2TPv3 interface information + + interfaces l2tpv3 + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=l2tpv3 + + + + Show summary of the specified L2TPv3 interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=l2tpv3 + + #include + + diff --git a/op-mode-definitions/show-interfaces-loopback.xml.in b/op-mode-definitions/show-interfaces-loopback.xml.in index 467e1a13d..028d1c079 100644 --- a/op-mode-definitions/show-interfaces-loopback.xml.in +++ b/op-mode-definitions/show-interfaces-loopback.xml.in @@ -4,25 +4,7 @@ - - - Show specified Loopback interface information - - interfaces loopback - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=loopback - - - - Show summary of the specified Loopback interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=loopback - - #include - - - + Show Loopback interface information @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=loopback + + + Show specified Loopback interface information + + interfaces loopback + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=loopback + + + + Show summary of the specified Loopback interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=loopback + + #include + + diff --git a/op-mode-definitions/show-interfaces-macsec.xml.in b/op-mode-definitions/show-interfaces-macsec.xml.in index 640031b77..027c05c63 100644 --- a/op-mode-definitions/show-interfaces-macsec.xml.in +++ b/op-mode-definitions/show-interfaces-macsec.xml.in @@ -19,21 +19,21 @@ ip -s macsec show + + + Show specified MACsec interface information + + interfaces macsec + + + ip macsec show $4 + + #include + + - - - Show specified MACsec interface information - - interfaces macsec - - - ip macsec show $4 - - #include - - - + diff --git a/op-mode-definitions/show-interfaces-pppoe.xml.in b/op-mode-definitions/show-interfaces-pppoe.xml.in index 0904418bf..0e13ecdb8 100644 --- a/op-mode-definitions/show-interfaces-pppoe.xml.in +++ b/op-mode-definitions/show-interfaces-pppoe.xml.in @@ -4,34 +4,7 @@ - - - Show specified PPPoE interface information - - interfaces pppoe - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=pppoe - - - - Show specified PPPoE interface log - - journalctl --no-hostname --boot --follow --unit "ppp@$4".service - - - - Show specified PPPoE interface statistics - - interfaces pppoe - - - ${vyos_op_scripts_dir}/show_ppp_stats.sh "$4" - - #include - - - + Show PPPoE interface information @@ -43,6 +16,33 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=pppoe + + + Show specified PPPoE interface information + + interfaces pppoe + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=pppoe + + + + Show specified PPPoE interface log + + journalctl --no-hostname --boot --follow --unit "ppp@$4".service + + + + Show specified PPPoE interface statistics + + interfaces pppoe + + + ${vyos_op_scripts_dir}/show_ppp_stats.sh "$4" + + #include + + diff --git a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in index a9e4257ce..140e7150d 100644 --- a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in +++ b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in @@ -4,27 +4,9 @@ - + - Show specified Pseudo-Ethernet/MACvlan interface information - - interfaces pseudo-ethernet - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=pseudo-ethernet - - - - Show summary of the specified pseudo-ethernet/MACvlan interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=pseudo-ethernet - - #include - - - - - Show Pseudo-Ethernet/MACvlan interface information + Show pseudo-ethernet/MACvlan interface information ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=pseudo-ethernet @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=pseudo-ethernet + + + Show specified pseudo-ethernet/MACvlan interface information + + interfaces pseudo-ethernet + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=pseudo-ethernet + + + + Show summary of the specified pseudo-ethernet/MACvlan interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=pseudo-ethernet + + #include + + diff --git a/op-mode-definitions/show-interfaces-sstpc.xml.in b/op-mode-definitions/show-interfaces-sstpc.xml.in index 61451db93..e0a53d9f4 100644 --- a/op-mode-definitions/show-interfaces-sstpc.xml.in +++ b/op-mode-definitions/show-interfaces-sstpc.xml.in @@ -4,34 +4,7 @@ - - - Show specified SSTP client interface information - - interfaces sstpc - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=sstpc - - - - Show specified SSTP client interface log - - journalctl --no-hostname --boot --follow --unit "ppp@$4".service - - - - Show specified SSTP client interface statistics - - interfaces sstpc - - - ${vyos_op_scripts_dir}/show_ppp_stats.sh "$4" - - #include - - - + Show SSTP client interface information @@ -43,6 +16,33 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=sstpc + + + Show specified SSTP client interface information + + interfaces sstpc + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=sstpc + + + + Show specified SSTP client interface log + + journalctl --no-hostname --boot --follow --unit "ppp@$4".service + + + + Show specified SSTP client interface statistics + + interfaces sstpc + + + ${vyos_op_scripts_dir}/show_ppp_stats.sh "$4" + + #include + + diff --git a/op-mode-definitions/show-interfaces-tunnel.xml.in b/op-mode-definitions/show-interfaces-tunnel.xml.in index 579b173cb..0707fe763 100644 --- a/op-mode-definitions/show-interfaces-tunnel.xml.in +++ b/op-mode-definitions/show-interfaces-tunnel.xml.in @@ -4,27 +4,9 @@ - + - Show specified Tunnel interface information - - interfaces tunnel - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=tunnel - - - - Show summary of the specified tunnel interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=tunnel - - #include - - - - - Show Tunnel interface information + Show tunnel interface information ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=tunnel @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=tunnel + + + Show specified tunnel interface information + + interfaces tunnel + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=tunnel + + + + Show summary of the specified tunnel interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=tunnel + + #include + + diff --git a/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in b/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in index 4112a17af..20e1754e7 100644 --- a/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in +++ b/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in @@ -4,25 +4,7 @@ - - - Show specified virtual-ethernet interface information - - interfaces virtual-ethernet - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=virtual-ethernet - - - - Show summary of the specified virtual-ethernet interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=virtual-ethernet - - #include - - - + Show virtual-ethernet interface information @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=virtual-ethernet + + + Show specified virtual-ethernet interface information + + interfaces virtual-ethernet + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=virtual-ethernet + + + + Show summary of the specified virtual-ethernet interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=virtual-ethernet + + #include + + diff --git a/op-mode-definitions/show-interfaces-vti.xml.in b/op-mode-definitions/show-interfaces-vti.xml.in index d13b3e7cc..460481bde 100644 --- a/op-mode-definitions/show-interfaces-vti.xml.in +++ b/op-mode-definitions/show-interfaces-vti.xml.in @@ -4,25 +4,7 @@ - - - Show specified VTI interface information - - interfaces vti - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=vti - - - - Show summary of the specified vti interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=vti - - #include - - - + Show VTI interface information @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=vti + + + Show specified VTI interface information + + interfaces vti + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=vti + + + + Show summary of the specified vti interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=vti + + #include + + diff --git a/op-mode-definitions/show-interfaces-vxlan.xml.in b/op-mode-definitions/show-interfaces-vxlan.xml.in index 89c8d075b..4623e9371 100644 --- a/op-mode-definitions/show-interfaces-vxlan.xml.in +++ b/op-mode-definitions/show-interfaces-vxlan.xml.in @@ -4,25 +4,7 @@ - - - Show specified VXLAN interface information - - interfaces vxlan - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=vxlan - - - - Show summary of the specified VXLAN interface information - - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=vxlan - - #include - - - + Show VXLAN interface information @@ -34,6 +16,24 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=vxlan + + + Show specified VXLAN interface information + + interfaces vxlan + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=vxlan + + + + Show summary of the specified VXLAN interface information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=vxlan + + #include + + diff --git a/op-mode-definitions/show-interfaces-wireguard.xml.in b/op-mode-definitions/show-interfaces-wireguard.xml.in index 6abca3a27..9457953ef 100644 --- a/op-mode-definitions/show-interfaces-wireguard.xml.in +++ b/op-mode-definitions/show-interfaces-wireguard.xml.in @@ -4,48 +4,6 @@ - - - Show specified WireGuard interface information - - - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=wireguard - - - - Show all IP addresses allowed for the specified interface - - wg show "$4" allowed-ips - - - - Show all endpoints for the specified interface - - wg show "$4" endpoints - - - - Show all peer IDs for the specified interface - - wg show "$4" peers - - - - Show interface public-key - - wg show "$4" public-key - - - - Shows current configuration and device information - - ${vyos_op_scripts_dir}/interfaces_wireguard.py show_summary --intf-name="$4" - - #include - - Show WireGuard interface information @@ -58,6 +16,48 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=wireguard + + + Show specified WireGuard interface information + + + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=wireguard + + + + Show all IP addresses allowed for the specified interface + + wg show "$4" allowed-ips + + + + Show all endpoints for the specified interface + + wg show "$4" endpoints + + + + Show all peer IDs for the specified interface + + wg show "$4" peers + + + + Show interface public-key + + wg show "$4" public-key + + + + Shows current configuration and device information + + ${vyos_op_scripts_dir}/interfaces_wireguard.py show_summary --intf-name="$4" + + #include + + diff --git a/op-mode-definitions/show-interfaces-wireless.xml.in b/op-mode-definitions/show-interfaces-wireless.xml.in index 16ea33d82..55e23adf5 100644 --- a/op-mode-definitions/show-interfaces-wireless.xml.in +++ b/op-mode-definitions/show-interfaces-wireless.xml.in @@ -6,7 +6,7 @@ - Show Wireless (WLAN) interface information + Show wireless (WLAN) interface information ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=wireless @@ -22,61 +22,61 @@ ${vyos_op_scripts_dir}/interfaces_wireless.py show_info - - - - - Show specified wireless interface information - - - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=wireless - - + - Show brief summary of the specified wireless interface + Show specified wireless interface information + + + - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=wireless - - - - Scan for networks via specified wireless interface - - ${vyos_op_scripts_dir}/interfaces_wireless.py show_scan --intf-name="$4" + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=wireless - + - Show detailed scan results + Show brief summary of the specified wireless interface - /sbin/iw dev "$4" scan ap-force + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=wireless - - - - - Show specified Wireless interface information - - ${vyos_op_scripts_dir}/interfaces_wireless.py show_stations --intf-name="$4" - - - - Show specified virtual network interface (vif) information - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=wireless - - + - Show summary of specified virtual network interface (vif) information + Scan for networks via specified wireless interface - ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=wireless + ${vyos_op_scripts_dir}/interfaces_wireless.py show_scan --intf-name="$4" + + + + Show detailed scan results + + /sbin/iw dev "$4" scan ap-force + + + + + + Show specified wireless interface information + + ${vyos_op_scripts_dir}/interfaces_wireless.py show_stations --intf-name="$4" + + + Show specified virtual network interface (vif) information + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=wireless + + + + Show summary of specified virtual network interface (vif) information + + ${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=wireless + + + + #include - - #include + - - + + diff --git a/op-mode-definitions/show-interfaces-wwan.xml.in b/op-mode-definitions/show-interfaces-wwan.xml.in index 87301d6c9..6616de9dc 100644 --- a/op-mode-definitions/show-interfaces-wwan.xml.in +++ b/op-mode-definitions/show-interfaces-wwan.xml.in @@ -4,86 +4,7 @@ - - - Show specified Wireless Wire Area Network (WWAN) interface information - - interfaces wwan - - - - ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=wirelessmodem - - - - Show WWAN module capabilities - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --capabilities - - - - Show WWAN module firmware - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --firmware - - - - Show WWAN module IMEI/ESN/MEID - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imei - - - - Show WWAN module IMSI - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imsi - - - - Show WWAN module manufacturer - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --model - - - - Show WWAN module MSISDN - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --msisdn - - - - Show WWAN module revision - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --revision - - - - Show WWAN module RF signal info - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --signal - - - - Show WWAN module connected SIM card information - - ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --sim - - - - Show WWAN module detailed information summary - - if cli-shell-api existsActive interfaces wwan $4; then mmcli --modem ${4#wwan}; else echo "Interface \"$4\" unconfigured!"; fi - - - - Show interface log for specified interface - - echo not implemented - - #include - - - + Show Wireless Modem (WWAN) interface information @@ -95,6 +16,85 @@ ${vyos_op_scripts_dir}/interfaces.py show --intf-type=wwan + + + Show specified Wireless Wire Area Network (WWAN) interface information + + interfaces wwan + + + + ${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=wirelessmodem + + + + Show WWAN module capabilities + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --capabilities + + + + Show WWAN module firmware + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --firmware + + + + Show WWAN module IMEI/ESN/MEID + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imei + + + + Show WWAN module IMSI + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imsi + + + + Show WWAN module manufacturer + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --model + + + + Show WWAN module MSISDN + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --msisdn + + + + Show WWAN module revision + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --revision + + + + Show WWAN module RF signal info + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --signal + + + + Show WWAN module connected SIM card information + + ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --sim + + + + Show WWAN module detailed information summary + + if cli-shell-api existsActive interfaces wwan $4; then mmcli --modem ${4#wwan}; else echo "Interface \"$4\" unconfigured!"; fi + + + + Show interface log for specified interface + + echo not implemented + + #include + + diff --git a/op-mode-definitions/show-interfaces.xml.in b/op-mode-definitions/show-interfaces.xml.in index 2d94080c7..e2d7d3dd3 100644 --- a/op-mode-definitions/show-interfaces.xml.in +++ b/op-mode-definitions/show-interfaces.xml.in @@ -26,34 +26,34 @@ ${vyos_op_scripts_dir}/interfaces.py show_summary - - - - - - - ${vyos_op_scripts_dir}/interfaces.py show_kernel --intf-name=$4 - - - - Show system interface in JSON format - - ${vyos_op_scripts_dir}/interfaces.py show_kernel --intf-name=$4 --detail - - - - Show system interface in JSON format - - ${vyos_op_scripts_dir}/interfaces.py show_kernel --intf-name=$4 --raw - - - Show all interfaces on this system ${vyos_op_scripts_dir}/interfaces.py show_kernel + + + + + + + ${vyos_op_scripts_dir}/interfaces.py show_kernel --intf-name=$4 + + + + Show system interface in JSON format + + ${vyos_op_scripts_dir}/interfaces.py show_kernel --intf-name=$4 --detail + + + + Show system interface in JSON format + + ${vyos_op_scripts_dir}/interfaces.py show_kernel --intf-name=$4 --raw + + + Show system interface in JSON format diff --git a/op-mode-definitions/show-ip-bgp.xml.in b/op-mode-definitions/show-ip-bgp.xml.in index ecef320bf..f2b98582e 100644 --- a/op-mode-definitions/show-ip-bgp.xml.in +++ b/op-mode-definitions/show-ip-bgp.xml.in @@ -11,12 +11,6 @@ vtysh -c "show ip bgp" #include - - - Show BGP VRF information - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - Show BGP VRF related information @@ -25,6 +19,10 @@ all + + Show BGP VRF information + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ #include diff --git a/op-mode-definitions/show-ip-route.xml.in b/op-mode-definitions/show-ip-route.xml.in index 37279d3d2..bbac433c7 100644 --- a/op-mode-definitions/show-ip-route.xml.in +++ b/op-mode-definitions/show-ip-route.xml.in @@ -13,13 +13,24 @@ vtysh -c "show ip route" - #include - + - Show kernel route cache + Show IP routes of specified IP address or prefix + + <x.x.x.x> <x.x.x.x/x> + - ip -s route list cache - + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show longer prefixes of routes for specified prefix + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + #include Show kernel route cache for a given route @@ -27,15 +38,13 @@ <x.x.x.x> <x.x.x.x/x> + + Show kernel route cache + ip -s route list cache + ip -s route list cache $5 #include - - - Show kernel route table - - ip route list - Show kernel route table for a given route @@ -43,6 +52,10 @@ <x.x.x.x> <x.x.x.x/x> + + Show kernel route table + ip route list + ip -s route list $5 #include @@ -93,7 +106,7 @@ #include #include #include - + Show IP routes of specified IP address or prefix @@ -109,28 +122,11 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + - - - Show IP routes of specified IP address or prefix - - <x.x.x.x> <x.x.x.x/x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show longer prefixes of routes for specified prefix - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - diff --git a/op-mode-definitions/show-ipv6-prefix-list.xml.in b/op-mode-definitions/show-ipv6-prefix-list.xml.in index 9e9df5b29..db1a2754e 100644 --- a/op-mode-definitions/show-ipv6-prefix-list.xml.in +++ b/op-mode-definitions/show-ipv6-prefix-list.xml.in @@ -13,6 +13,50 @@ vtysh -c "show ipv6 prefix-list" + + + Show specified IPv6 prefix-list + + WORD + + + vtysh -c "show ipv6 prefix-list $4" + + + + Show select prefix of specified IPv6 prefix-list + + <h:h:h:h:h:h:h:h/x> + + + vtysh -c "show ipv6 prefix-list $4 $5" + + + + Show first-match from select prefix of named IPv6 prefix-list + + vtysh -c "show ipv6 prefix-list $4 $5 first-match" + + + + Show longer match of select prefix from named IPv6 prefix-list + + vtysh -c "show ipv6 prefix-list $4 $5 longer" + + + + + + Show specified sequence from specified IPv6 prefix-list + + + Show specified sequence from specified IPv6 prefix-list + vtysh -c "show ipv6 prefix-list $4 seq" + + vtysh -c "show ipv6 prefix-list $4 seq $6" + + + Show detail of specified IPv6 prefix-list @@ -35,52 +79,6 @@ - - - Show specified IPv6 prefix-list - - WORD - - - vtysh -c "show ipv6 prefix-list $4" - - - - Show select prefix of specified IPv6 prefix-list - - <h:h:h:h:h:h:h:h/x> - - - vtysh -c "show ipv6 prefix-list $4 $5" - - - - Show first-match from select prefix of named IPv6 prefix-list - - vtysh -c "show ipv6 prefix-list $4 $5 first-match" - - - - Show longer match of select prefix from named IPv6 prefix-list - - vtysh -c "show ipv6 prefix-list $4 $5 longer" - - - - - - Show specified sequence from specified IPv6 prefix-list - - vtysh -c "show ipv6 prefix-list $4 seq" - - - - Show specified sequence from specified IPv6 prefix-list - - vtysh -c "show ipv6 prefix-list $4 seq $6" - - - diff --git a/op-mode-definitions/show-ipv6-route.xml.in b/op-mode-definitions/show-ipv6-route.xml.in index f68a94971..8690ed710 100644 --- a/op-mode-definitions/show-ipv6-route.xml.in +++ b/op-mode-definitions/show-ipv6-route.xml.in @@ -13,13 +13,24 @@ vtysh -c "show ipv6 route" - #include - + - Show kernel IPv6 route cache + Show IPv6 routes of given address or prefix + + <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + - ip -s -f inet6 route list cache - + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + Show longer prefixes of routes for given prefix + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + + #include Show kernel IPv6 route cache for a given route @@ -27,15 +38,13 @@ <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + + Show kernel IPv6 route cache + ip -s -f inet6 route list cache + ip -s -f inet6 route list cache $5 #include - - - Show kernel IPv6 route table - - ip -f inet6 route list - Show kernel IPv6 route table for a given route @@ -43,6 +52,10 @@ <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> + + Show kernel IPv6 route table + ip -f inet6 route list + ip -s -f inet6 route list $5 #include @@ -83,7 +96,7 @@ ${vyos_op_scripts_dir}/route.py show_summary --family inet6 --vrf $5 - + Show IPv6 routes of given address or prefix @@ -99,7 +112,7 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + #include #include #include @@ -114,23 +127,6 @@ - - - Show IPv6 routes of given address or prefix - - <h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x> - - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - Show longer prefixes of routes for given prefix - - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in index d1320bc00..499e7f84b 100755 --- a/op-mode-definitions/show-log.xml.in +++ b/op-mode-definitions/show-log.xml.in @@ -5,21 +5,21 @@ Show system information - - - Show last number of messages in master logging buffer - - <1-9999> - - - if ${vyos_validators_dir}/numeric --range 1-9999 "$3"; then journalctl --no-hostname --boot --lines "$3"; fi - - + Show contents of current master logging buffer journalctl --no-hostname --boot + + + Show last number of messages in master logging buffer + + <1-9999> + + + if ${vyos_validators_dir}/numeric --range 1-9999 "$3"; then journalctl --no-hostname --boot --lines "$3"; fi + Show audit logs @@ -858,14 +858,12 @@ <NUMBER> + + Show last 10 lines of /var/log/messages file + tail -n 10 /var/log/messages + tail -n "$4" /var/log/messages | ${VYATTA_PAGER:-cat} - - - Show last 10 lines of /var/log/messages file - - tail -n 10 /var/log/messages - Show log for ALL Virtual Private Network services diff --git a/op-mode-definitions/show-mpls.xml.in b/op-mode-definitions/show-mpls.xml.in index 86f6f1bcc..43fa26b64 100644 --- a/op-mode-definitions/show-mpls.xml.in +++ b/op-mode-definitions/show-mpls.xml.in @@ -18,6 +18,23 @@ vtysh -c "show mpls ldp binding" + + + LDP forwarding equivalence class + + <x.x.x.x/x> <h:h:h:h:h:h:h:h/h> + + + vtysh -c "show mpls ldp binding $5" + + + + Show detailed information + + vtysh -c "show mpls ldp binding $5 detail" + + + Show detailed information @@ -116,23 +133,6 @@ - - - LDP forwarding equivalence class - - <x.x.x.x/x> <h:h:h:h:h:h:h:h/h> - - - vtysh -c "show mpls ldp binding $5" - - - - Show detailed information - - vtysh -c "show mpls ldp binding $5 detail" - - - Discovery hello information @@ -171,32 +171,32 @@ vtysh -c "show mpls ldp neighbor capabilities" - - - - - LDP neighbor - - <x.x.x.x> <h:h:h:h:h:h:h:h> - - - - vtysh -c "show mpls ldp neighbor $5" - - - - Show detailed information - - vtysh -c "show mpls ldp neighbor $5 detail" - - + - Show neighbor capability information + LDP neighbor + + <x.x.x.x> <h:h:h:h:h:h:h:h> + + - vtysh -c "show mpls ldp neighbor $5 capabilities" - + vtysh -c "show mpls ldp neighbor $5" + + + + Show detailed information + + vtysh -c "show mpls ldp neighbor $5 detail" + + + + Show neighbor capability information + + vtysh -c "show mpls ldp neighbor $5 capabilities" + + + - + diff --git a/op-mode-definitions/show-openfabric.xml.in b/op-mode-definitions/show-openfabric.xml.in index 2f489866e..124b9616e 100644 --- a/op-mode-definitions/show-openfabric.xml.in +++ b/op-mode-definitions/show-openfabric.xml.in @@ -24,11 +24,11 @@ + #include #include ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - #include Show OpenFabric neighbor adjacencies diff --git a/op-mode-definitions/show-vrf.xml.in b/op-mode-definitions/show-vrf.xml.in index c18649844..574e92bfe 100644 --- a/op-mode-definitions/show-vrf.xml.in +++ b/op-mode-definitions/show-vrf.xml.in @@ -14,31 +14,31 @@ ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - - - - - Show information on specific VRF instance - - vrf name - - - ${vyos_op_scripts_dir}/vrf.py show --name="$3" - - - - Shows all process ids associated with VRF - - ip vrf pids "$3" - - + - Show VXLAN VNI association + Show information on specific VRF instance + + vrf name + - ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ - + ${vyos_op_scripts_dir}/vrf.py show --name="$3" + + + + Shows all process ids associated with VRF + + ip vrf pids "$3" + + + + Show VXLAN VNI association + + ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@ + + + - - + + diff --git a/op-mode-definitions/terminal.xml.in b/op-mode-definitions/terminal.xml.in index 25b0dc046..163159846 100644 --- a/op-mode-definitions/terminal.xml.in +++ b/op-mode-definitions/terminal.xml.in @@ -74,12 +74,6 @@ - - - Set terminal pager to default (less) - - VYATTA_PAGER=${_vyatta_default_pager} - Set terminal pager @@ -87,6 +81,10 @@ <PROGRAM> + + Set terminal pager to default (less) + VYATTA_PAGER=${_vyatta_default_pager} + VYATTA_PAGER=$4 diff --git a/op-mode-definitions/traceroute.xml.in b/op-mode-definitions/traceroute.xml.in index aba0f45e3..9976bdd97 100644 --- a/op-mode-definitions/traceroute.xml.in +++ b/op-mode-definitions/traceroute.xml.in @@ -9,7 +9,7 @@ ${vyos_op_scripts_dir}/traceroute.py ${@:2} - + Traceroute options @@ -17,7 +17,7 @@ ${vyos_op_scripts_dir}/traceroute.py ${@:2} - + diff --git a/op-mode-definitions/traffic-dump.xml.in b/op-mode-definitions/traffic-dump.xml.in index e86e69736..a145742e9 100644 --- a/op-mode-definitions/traffic-dump.xml.in +++ b/op-mode-definitions/traffic-dump.xml.in @@ -16,7 +16,7 @@ - + Traffic capture options @@ -24,7 +24,7 @@ ${vyos_op_scripts_dir}/tcpdump.py "${@:4}" - + diff --git a/op-mode-definitions/vrrp.xml.in b/op-mode-definitions/vrrp.xml.in index ae204602f..b2b2886c0 100644 --- a/op-mode-definitions/vrrp.xml.in +++ b/op-mode-definitions/vrrp.xml.in @@ -2,31 +2,31 @@ - - - Show specified VRRP (Virtual Router Redundancy Protocol) group information - - - - - Show VRRP statistics - - ${vyos_op_scripts_dir}/vrrp.py show_statistics --group-name="$3" - - - - Show detailed VRRP state information - - ${vyos_op_scripts_dir}/vrrp.py show_detail --group-name="$3" - - - Show VRRP (Virtual Router Redundancy Protocol) information ${vyos_op_scripts_dir}/vrrp.py show_summary + + + Show specified VRRP (Virtual Router Redundancy Protocol) group information + + + + + Show VRRP statistics + + ${vyos_op_scripts_dir}/vrrp.py show_statistics --group-name="$3" + + + + Show detailed VRRP state information + + ${vyos_op_scripts_dir}/vrrp.py show_detail --group-name="$3" + + + Show VRRP statistics diff --git a/schema/op-mode-definition.rnc b/schema/op-mode-definition.rnc index 46430daa4..2fcb2ddd8 100644 --- a/schema/op-mode-definition.rnc +++ b/schema/op-mode-definition.rnc @@ -60,6 +60,15 @@ standalone = element standalone help & command } +# Virtual tag nodes provide a way to add a variable argument +# to a command that also needs fixed arguments, +# like "show ip route" that can take "show ip route bgp" +# or a network and arguments after it, like "show ip route 10.0.0.0/8 longer-prefixes" +virtualTagNode = element virtualTagNode +{ + (properties? & children? & command?) +} + # Leaf nodes are terminal configuration nodes that can't have children, # but can have values. @@ -69,9 +78,11 @@ leafNode = element leafNode (command & properties) } -# Normal and tag nodes may have children +# Normal and tag nodes may have children: nodes, leaf nodes, or tag nodes. +# There can only be one virtual tag node child, though. children = element children { + (virtualTagNode? & (node | tagNode | leafNode)*) | (node | tagNode | leafNode)+ } diff --git a/schema/op-mode-definition.rng b/schema/op-mode-definition.rng index bfd5cb50a..d7a56c6b2 100644 --- a/schema/op-mode-definition.rng +++ b/schema/op-mode-definition.rng @@ -101,6 +101,27 @@ + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + +