diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-04 19:10:49 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-03-04 21:43:59 +0100 |
| commit | d93efd69083c153c1586dd08d65f1d10769820b7 (patch) | |
| tree | c6dc44d93bd7162dbcf86daf15dde57fa59ef283 | |
| parent | b34ec45126f9ef9b285e46bbf3f917bd926e7f4b (diff) | |
| download | vyos-1x-d93efd69083c153c1586dd08d65f1d10769820b7.tar.gz vyos-1x-d93efd69083c153c1586dd08d65f1d10769820b7.zip | |
vrf: T31: make 'show vrf' command behave like other 'show interface commands'
- remove the additional depth for querying discrete VRF names
- retrieve available VRF names from via <path> from CLI rather then invoking
an external script
| -rw-r--r-- | op-mode-definitions/show-vrf.xml | 22 | ||||
| -rwxr-xr-x | src/op_mode/show_vrf.py (renamed from src/completion/list_vrf.py) | 0 |
2 files changed, 10 insertions, 12 deletions
diff --git a/op-mode-definitions/show-vrf.xml b/op-mode-definitions/show-vrf.xml index fb2fddd49..360153d8e 100644 --- a/op-mode-definitions/show-vrf.xml +++ b/op-mode-definitions/show-vrf.xml @@ -6,19 +6,17 @@ <properties> <help>Show VRF information</help> </properties> - <command>${vyos_completion_dir}/list_vrf.py -e</command> - <children> - <tagNode name="name"> - <properties> - <help>Show VRF information for an interface</help> - <completionHelp> - <script>${vyos_completion_dir}/list_vrf.py</script> - </completionHelp> - </properties> - <command>${vyos_completion_dir}/list_vrf.py -e "$4"</command> - </tagNode> - </children> + <command>${vyos_op_scripts_dir}/show_vrf.py -e</command> </node> + <tagNode name="vrf"> + <properties> + <help>Show information on specific VRF instance</help> + <completionHelp> + <path>vrf name</path> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/show_vrf.py -e "$3"</command> + </tagNode> </children> </node> </interfaceDefinition> diff --git a/src/completion/list_vrf.py b/src/op_mode/show_vrf.py index 210b3c9a4..210b3c9a4 100755 --- a/src/completion/list_vrf.py +++ b/src/op_mode/show_vrf.py |