diff options
| -rw-r--r-- | op-mode-definitions/generate_tech-support_archive.xml.in | 20 | ||||
| -rw-r--r-- | op-mode-definitions/policy-route.xml.in | 20 | ||||
| -rw-r--r-- | op-mode-definitions/show-babel.xml.in | 10 | ||||
| -rw-r--r-- | op-mode-definitions/show-bfd.xml.in | 5 | ||||
| -rw-r--r-- | op-mode-definitions/show-bgp.xml.in | 10 | ||||
| -rw-r--r-- | op-mode-definitions/show-bridge.xml.in | 10 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in | 72 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-ospfv3.xml.in | 34 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-prefix-list.xml.in | 20 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6.xml.in | 10 | ||||
| -rw-r--r-- | op-mode-definitions/show-route-map.xml.in | 10 | ||||
| -rw-r--r-- | op-mode-definitions/show-users.xml.in | 10 | ||||
| -rw-r--r-- | op-mode-definitions/system-image.xml.in | 22 |
13 files changed, 99 insertions, 154 deletions
diff --git a/op-mode-definitions/generate_tech-support_archive.xml.in b/op-mode-definitions/generate_tech-support_archive.xml.in index b7e025a38..939b3dec4 100644 --- a/op-mode-definitions/generate_tech-support_archive.xml.in +++ b/op-mode-definitions/generate_tech-support_archive.xml.in @@ -7,12 +7,6 @@ <help>Generate tech support info</help> </properties> <children> - <node name="archive"> - <properties> - <help>Generate tech support archive</help> - </properties> - <command>${vyos_op_scripts_dir}/generate_tech-support_archive.py</command> - </node> <tagNode name="archive"> <properties> <help>Generate tech support archive to defined location</help> @@ -21,13 +15,11 @@ </completionHelp> </properties> <command>${vyos_op_scripts_dir}/generate_tech-support_archive.py $4</command> - </tagNode> - <node name="machine-readable-archive"> - <properties> + <standalone> <help>Generate tech support archive</help> - </properties> - <command>${vyos_op_scripts_dir}/tech_support.py show --raw | gzip> $4.json.gz</command> - </node> + <command>${vyos_op_scripts_dir}/generate_tech-support_archive.py</command> + </standalone> + </tagNode> <tagNode name="machine-readable-archive"> <properties> <help>Generate tech support archive to defined location</help> @@ -36,6 +28,10 @@ </completionHelp> </properties> <command>${vyos_op_scripts_dir}/tech_support.py show --raw | gzip > $4.json.gz</command> + <standalone> + <help>Generate a machine-readable tech support archive</help> + <command>${vyos_op_scripts_dir}/tech_support.py show --raw | gzip> $4.json.gz</command> + </standalone> </tagNode> </children> </node> diff --git a/op-mode-definitions/policy-route.xml.in b/op-mode-definitions/policy-route.xml.in index 6ddbb51a5..e733d976c 100644 --- a/op-mode-definitions/policy-route.xml.in +++ b/op-mode-definitions/policy-route.xml.in @@ -84,12 +84,6 @@ <help>Show policy information</help> </properties> <children> - <node name="route6"> - <properties> - <help>Show IPv6 policy chain</help> - </properties> - <command>${vyos_op_scripts_dir}/policy_route.py --action show_all --ipv6</command> - </node> <tagNode name="route6"> <properties> <help>Show IPv6 policy chains</help> @@ -97,6 +91,10 @@ <path>policy route6</path> </completionHelp> </properties> + <standalone> + <help>Show IPv6 policy chain</help> + <command>${vyos_op_scripts_dir}/policy_route.py --action show_all --ipv6</command> + </standalone> <children> <tagNode name="rule"> <properties> @@ -110,12 +108,6 @@ </children> <command>${vyos_op_scripts_dir}/policy_route.py --action show --name $4 --ipv6</command> </tagNode> - <node name="route"> - <properties> - <help>Show IPv4 policy chain</help> - </properties> - <command>${vyos_op_scripts_dir}/policy_route.py --action show_all</command> - </node> <tagNode name="route"> <properties> <help>Show IPv4 policy chains</help> @@ -123,6 +115,10 @@ <path>policy route</path> </completionHelp> </properties> + <standalone> + <help>Show IPv4 policy chains</help> + <command>${vyos_op_scripts_dir}/policy_route.py --action show_all</command> + </standalone> <children> <tagNode name="rule"> <properties> diff --git a/op-mode-definitions/show-babel.xml.in b/op-mode-definitions/show-babel.xml.in index 0a1f1b262..8b841eeac 100644 --- a/op-mode-definitions/show-babel.xml.in +++ b/op-mode-definitions/show-babel.xml.in @@ -13,12 +13,6 @@ </properties> <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </leafNode> - <leafNode name="neighbor"> - <properties> - <help>Show Babel neighbor information</help> - </properties> - <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> - </leafNode> <tagNode name="neighbor"> <properties> <help>Show Babel neighbor information for specified interface</help> @@ -27,6 +21,10 @@ </completionHelp> </properties> <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <standalone> + <help>Show Babel neighbor information</help> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </standalone> </tagNode> <leafNode name="route"> <properties> diff --git a/op-mode-definitions/show-bfd.xml.in b/op-mode-definitions/show-bfd.xml.in index 87d672e04..02863975b 100644 --- a/op-mode-definitions/show-bfd.xml.in +++ b/op-mode-definitions/show-bfd.xml.in @@ -7,11 +7,6 @@ <help>Show Bidirectional Forwarding Detection (BFD)</help> </properties> <children> - <node name="peer"> - <properties> - <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help> - </properties> - </node> <tagNode name="peer"> <properties> <help>Show Bidirectional Forwarding Detection (BFD) peer status</help> diff --git a/op-mode-definitions/show-bgp.xml.in b/op-mode-definitions/show-bgp.xml.in index 8b1992432..ee232fa04 100644 --- a/op-mode-definitions/show-bgp.xml.in +++ b/op-mode-definitions/show-bgp.xml.in @@ -78,12 +78,6 @@ </node> </children> </tagNode> - <leafNode name="vrf"> - <properties> - <help>Show BGP VRF information</help> - </properties> - <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> - </leafNode> <tagNode name="vrf"> <properties> <help>Show BGP VRF related information</help> @@ -93,6 +87,10 @@ </completionHelp> </properties> <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <standalone> + <help>Show BGP VRF information</help> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </standalone> <children> #include <include/bgp/show-bgp-common.xml.i> #include <include/bgp/martian-next-hop.xml.i> diff --git a/op-mode-definitions/show-bridge.xml.in b/op-mode-definitions/show-bridge.xml.in index 40fadac8b..47c3d2e6e 100644 --- a/op-mode-definitions/show-bridge.xml.in +++ b/op-mode-definitions/show-bridge.xml.in @@ -43,12 +43,6 @@ </leafNode> </children> </node> - <leafNode name="bridge"> - <properties> - <help>Show bridging information</help> - </properties> - <command>${vyos_op_scripts_dir}/bridge.py show</command> - </leafNode> <tagNode name="bridge"> <properties> <help>Show bridge information for a given bridge interface</help> @@ -57,6 +51,10 @@ </completionHelp> </properties> <command>bridge -c link show | grep "master $3"</command> + <standalone> + <help>Show bridge interface information</help> + <command>${vyos_op_scripts_dir}/bridge.py show</command> + </standalone> <children> <node name="spanning-tree"> <properties> diff --git a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in index d7222516a..7a466d8c1 100644 --- a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in +++ b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in @@ -7,65 +7,57 @@ <help>Show IPv4 routing information</help> </properties> <children> - <leafNode name="access-list"> - <properties> - <help>Show all IP access-lists</help> - </properties> - <command>vtysh -c "show ip access-list"</command> - </leafNode> <tagNode name="access-list"> <properties> - <help>Show all IP access-lists</help> + <help>Show IP access-list</help> <completionHelp> <path>policy access-list</path> </completionHelp> </properties> <command>vtysh -c "show ip access-list $4"</command> + <standalone> + <help>Show all IP access lists</help> + <command>vtysh -c "show ip access-list"</command> + </standalone> </tagNode> - <leafNode name="as-path-access-list"> - <properties> - <help>Show all as-path-access-lists</help> - </properties> - <command>vtysh -c "show ip as-path-access-list"</command> - </leafNode> <tagNode name="as-path-access-list"> <properties> - <help>Show all as-path-access-lists</help> + <help>Show as-path-access-list</help> <completionHelp> <path>policy as-path-list</path> </completionHelp> </properties> <command>vtysh -c "show ip as-path-access-list $4"</command> + <standalone> + <help>Show all AS path access lists</help> + <command>vtysh -c "show ip as-path-access-list"</command> + </standalone> </tagNode> - <leafNode name="community-list"> - <properties> - <help>Show IP community-lists</help> - </properties> - <command>vtysh -c "show bgp community-list"</command> - </leafNode> <tagNode name="community-list"> <properties> - <help>Show IP community-lists</help> + <help>Show BGP community-list</help> <completionHelp> <path>policy community-list</path> </completionHelp> </properties> <command>vtysh -c "show bgp community-list $4 detail"</command> + <standalone> + <help>Show all BGP community lists</help> + <command>vtysh -c "show bgp community-list"</command> + </standalone> </tagNode> - <leafNode name="extcommunity-list"> - <properties> - <help>Show extended IP community-lists</help> - </properties> - <command>vtysh -c "show bgp extcommunity-list"</command> - </leafNode> <tagNode name="extcommunity-list"> <properties> - <help>Show extended IP community-lists</help> + <help>Show extended BGP community list</help> <completionHelp> <path>policy extcommunity-list</path> </completionHelp> </properties> <command>vtysh -c "show bgp extcommunity-list $4 detail"</command> + <standalone> + <help>Show all extended BGP community lists</help> + <command>vtysh -c "show bgp extcommunity-list"</command> + </standalone> </tagNode> <leafNode name="forwarding"> <properties> @@ -73,35 +65,31 @@ </properties> <command>vtysh -c "show ip forwarding"</command> </leafNode> - <leafNode name="large-community-list"> - <properties> - <help>Show IP large-community-lists</help> - </properties> - <command>vtysh -c "show bgp large-community-list"</command> - </leafNode> <tagNode name="large-community-list"> <properties> - <help>Show IP large-community-lists</help> + <help>Show BGP large-community-list</help> <completionHelp> <path>policy large-community-list</path> </completionHelp> </properties> <command>vtysh -c "show bgp large-community-list $4 detail"</command> + <standalone> + <help>Show all BGP large community lists</help> + <command>vtysh -c "show bgp large-community-list"</command> + </standalone> </tagNode> - <leafNode name="prefix-list"> - <properties> - <help>Show all IP prefix-lists</help> - </properties> - <command>vtysh -c "show ip prefix-list"</command> - </leafNode> <tagNode name="prefix-list"> <properties> - <help>Show all IP prefix-lists</help> + <help>Show IP prefix-list</help> <completionHelp> <path>policy prefix-list</path> </completionHelp> </properties> <command>vtysh -c "show ip prefix-list $4"</command> + <standalone> + <help>Show all IP prefix lists</help> + <command>vtysh -c "show ip prefix-list"</command> + </standalone> </tagNode> <leafNode name="protocol"> <properties> diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml.in b/op-mode-definitions/show-ipv6-ospfv3.xml.in index e1fcf470f..b4a1c6c8a 100644 --- a/op-mode-definitions/show-ipv6-ospfv3.xml.in +++ b/op-mode-definitions/show-ipv6-ospfv3.xml.in @@ -13,12 +13,6 @@ </properties> <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> @@ -27,6 +21,10 @@ </completionHelp> </properties> <command>vtysh -c "show ipv6 ospf6 area $5 spf tree"</command> + <standalone> + <help>Show Shortest Path First tree information</help> + <command>vtysh -c "show ipv6 ospf6 spf tree"</command> + </standalone> <children> <tagNode name="router"> <properties> @@ -47,16 +45,6 @@ #include <include/ospfv3/neighbor.xml.i> #include <include/ospfv3/redistribute.xml.i> #include <include/ospfv3/route.xml.i> - <node name="vrf"> - <properties> - <help>Specify the VRF</help> - <completionHelp> - <list>all</list> - <path>vrf name</path> - </completionHelp> - </properties> - <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> - </node> <tagNode name="vrf"> <properties> <help>VRF name</help> @@ -66,13 +54,11 @@ </completionHelp> </properties> <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <standalone> + <help>Show OSPFv3 information in given VRF</help> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </standalone> <children> - <node name="area"> - <properties> - <help>Show Shortest Path First tree information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 vrf $5 spf tree"</command> - </node> <tagNode name="area"> <properties> <help>Area ID (as an IPv4 notation)</help> @@ -81,6 +67,10 @@ </completionHelp> </properties> <command>vtysh -c "show ipv6 ospf6 vrf $5 area $7 spf tree"</command> + <standalone> + <help>Show Shortest Path First tree information</help> + <command>vtysh -c "show ipv6 ospf6 vrf $5 spf tree"</command> + </standalone> <children> <tagNode name="router"> <properties> diff --git a/op-mode-definitions/show-ipv6-prefix-list.xml.in b/op-mode-definitions/show-ipv6-prefix-list.xml.in index e003ad110..9e9df5b29 100644 --- a/op-mode-definitions/show-ipv6-prefix-list.xml.in +++ b/op-mode-definitions/show-ipv6-prefix-list.xml.in @@ -13,29 +13,25 @@ </properties> <command>vtysh -c "show ipv6 prefix-list"</command> <children> - <node name="detail"> - <properties> - <help>Show detail of IPv6 prefix-lists</help> - </properties> - <command>vtysh -c "show ipv6 prefix-list detail"</command> - </node> <tagNode name="detail"> <properties> <help>Show detail of specified IPv6 prefix-list</help> </properties> <command>vtysh -c "show ipv6 prefix-list detail $5"</command> + <standalone> + <help>Show details of IPv6 prefix lists</help> + <command>vtysh -c "show ipv6 prefix-list detail"</command> + </standalone> </tagNode> - <node name="summary"> - <properties> - <help>Show summary of IPv6 prefix-lists</help> - </properties> - <command>vtysh -c "show ipv6 prefix-list summary"</command> - </node> <tagNode name="summary"> <properties> <help>Show summary of specified IPv6 prefix-list</help> </properties> <command>vtysh -c "show ipv6 prefix-list summary $5"</command> + <standalone> + <help>Show summary of IPv6 prefix lists</help> + <command>vtysh -c "show ipv6 prefix-list summary"</command> + </standalone> </tagNode> </children> </node> diff --git a/op-mode-definitions/show-ipv6.xml.in b/op-mode-definitions/show-ipv6.xml.in index e10379ac2..314a686fe 100644 --- a/op-mode-definitions/show-ipv6.xml.in +++ b/op-mode-definitions/show-ipv6.xml.in @@ -7,12 +7,6 @@ <help>Show IPv6 networking information</help> </properties> <children> - <node name="access-list"> - <properties> - <help>Show all IPv6 access-lists</help> - </properties> - <command>vtysh -c "show ipv6 access-list"</command> - </node> <tagNode name="access-list"> <properties> <help>Show specified IPv6 access-list</help> @@ -21,6 +15,10 @@ </completionHelp> </properties> <command>vtysh -c "show ipv6 access-list $4"</command> + <standalone> + <help>Show all IPv6 access-lists</help> + <command>vtysh -c "show ipv6 access-list"</command> + </standalone> </tagNode> <node name="forwarding"> <properties> diff --git a/op-mode-definitions/show-route-map.xml.in b/op-mode-definitions/show-route-map.xml.in index 633b2a4cb..a34ae0200 100644 --- a/op-mode-definitions/show-route-map.xml.in +++ b/op-mode-definitions/show-route-map.xml.in @@ -2,12 +2,6 @@ <interfaceDefinition> <node name="show"> <children> - <node name="route-map"> - <properties> - <help>Show route-map information</help> - </properties> - <command>vtysh -c "show route-map"</command> - </node> <tagNode name="route-map"> <properties> <help>Show specified route-map information</help> @@ -16,6 +10,10 @@ </completionHelp> </properties> <command>vtysh -c "show route-map $3"</command> + <standalone> + <help>Show route map information</help> + <command>vtysh -c "show route-map"</command> + </standalone> </tagNode> </children> </node> diff --git a/op-mode-definitions/show-users.xml.in b/op-mode-definitions/show-users.xml.in index a026e47e7..a9cde3138 100644 --- a/op-mode-definitions/show-users.xml.in +++ b/op-mode-definitions/show-users.xml.in @@ -8,12 +8,6 @@ </properties> <command>who -H</command> <children> - <node name="recent"> - <properties> - <help>Show 10 recently logged in users</help> - </properties> - <command>last -aF -n 10 | sed -e 's/^wtmp begins/Displaying logins since/'</command> - </node> <tagNode name="recent"> <properties> <help>Show specified number of recently logged in users</help> @@ -22,6 +16,10 @@ </completionHelp> </properties> <command>last -aF -n $4 | sed -e 's/^wtmp begins/Displaying logins since/'</command> + <standalone> + <help>Show 10 recently logged in users</help> + <command>last -aF -n 10 | sed -e 's/^wtmp begins/Displaying logins since/'</command> + </standalone> </tagNode> </children> </node> diff --git a/op-mode-definitions/system-image.xml.in b/op-mode-definitions/system-image.xml.in index acd634286..a6634fc65 100644 --- a/op-mode-definitions/system-image.xml.in +++ b/op-mode-definitions/system-image.xml.in @@ -86,20 +86,18 @@ <help>Set system image parameters</help> </properties> <children> - <node name="default-boot"> - <properties> - <help>Set default image to boot.</help> - </properties> - <command>${vyos_op_scripts_dir}/image_manager.py --action set</command> - </node> <tagNode name="default-boot"> <properties> - <help>Set default image to boot.</help> + <help>Set default image to boot</help> <completionHelp> <script>${vyos_op_scripts_dir}/image_manager.py --action list</script> </completionHelp> </properties> <command>${vyos_op_scripts_dir}/image_manager.py --action set --image-name "${5}"</command> + <standalone> + <help>Set default image to boot</help> + <command>${vyos_op_scripts_dir}/image_manager.py --action set</command> + </standalone> </tagNode> </children> </node> @@ -130,12 +128,6 @@ <help>Delete system objects</help> </properties> <children> - <node name="image"> - <properties> - <help>Remove an installed image from the system</help> - </properties> - <command>${vyos_op_scripts_dir}/image_manager.py --action delete</command> - </node> <tagNode name="image"> <properties> <help>Remove an installed image from the system</help> @@ -144,6 +136,10 @@ </completionHelp> </properties> <command>${vyos_op_scripts_dir}/image_manager.py --action delete --image-name "${4}"</command> + <standalone> + <help>Remove an installed image from the system</help> + <command>${vyos_op_scripts_dir}/image_manager.py --action delete</command> + </standalone> </tagNode> </children> </node> |