diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-05-27 19:31:18 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 19:31:18 +0700 |
| commit | e57b934644379a81ac76f34c2edb7d3029f8013c (patch) | |
| tree | 6d41ffb42aec033adedfe573e5f79cbf7efccd82 | |
| parent | fbe88e561c69936d67f372d1fab9e55610567fcc (diff) | |
| parent | fb23d70afd8386e9c986653436b0caa9d5b6deb0 (diff) | |
| download | vyos-1x-e57b934644379a81ac76f34c2edb7d3029f8013c.tar.gz vyos-1x-e57b934644379a81ac76f34c2edb7d3029f8013c.zip | |
Merge pull request #435 from sever-sever/T2512-fix
op-mode: T2512: Fix conflict templates ipv4-route and show-ip-route
| -rw-r--r-- | op-mode-definitions/ipv4-route.xml | 38 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-route.xml | 30 |
2 files changed, 30 insertions, 38 deletions
diff --git a/op-mode-definitions/ipv4-route.xml b/op-mode-definitions/ipv4-route.xml index d2846a6f2..1bda3ac11 100644 --- a/op-mode-definitions/ipv4-route.xml +++ b/op-mode-definitions/ipv4-route.xml @@ -16,44 +16,6 @@ </properties> <command>netstat -gn4</command> </leafNode> - - <node name="route"> - <properties> - <help>Show IP routes</help> - </properties> - <children> - <node name="cache"> - <properties> - <help>Show kernel route cache</help> - </properties> - <command>ip -s route list cache</command> - </node> - <tagNode name="cache"> - <properties> - <help>Show kernel route cache for a given route</help> - <completionHelp> - <list><x.x.x.x> <x.x.x.x/x></list> - </completionHelp> - </properties> - <command>ip -s route list cache $5</command> - </tagNode> - <node name="forward"> - <properties> - <help>Show kernel route table</help> - </properties> - <command>ip route list</command> - </node> - <tagNode name="forward"> - <properties> - <help>Show kernel route table for a given route</help> - <completionHelp> - <list><x.x.x.x> <x.x.x.x/x></list> - </completionHelp> - </properties> - <command>ip -s route list $5</command> - </tagNode> - </children> - </node> </children> </node> </children> diff --git a/op-mode-definitions/show-ip-route.xml b/op-mode-definitions/show-ip-route.xml index 2379b3aae..d12d132c0 100644 --- a/op-mode-definitions/show-ip-route.xml +++ b/op-mode-definitions/show-ip-route.xml @@ -19,12 +19,42 @@ </properties> <command>/usr/bin/vtysh -c "show ip route bgp"</command> </leafNode> + <node name="cache"> + <properties> + <help>Show kernel route cache</help> + </properties> + <command>ip -s route list cache</command> + </node> + <tagNode name="cache"> + <properties> + <help>Show kernel route cache for a given route</help> + <completionHelp> + <list><x.x.x.x> <x.x.x.x/x></list> + </completionHelp> + </properties> + <command>ip -s route list cache $5</command> + </tagNode> <leafNode name="connected"> <properties> <help>Show IP connected routes</help> </properties> <command>/usr/bin/vtysh -c "show ip route connected"</command> </leafNode> + <node name="forward"> + <properties> + <help>Show kernel route table</help> + </properties> + <command>ip route list</command> + </node> + <tagNode name="forward"> + <properties> + <help>Show kernel route table for a given route</help> + <completionHelp> + <list><x.x.x.x> <x.x.x.x/x></list> + </completionHelp> + </properties> + <command>ip -s route list $5</command> + </tagNode> <leafNode name="kernel"> <properties> <help>Show IP kernel routes</help> |