summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-15 17:09:48 +0100
committerGitHub <noreply@github.com>2021-01-15 17:09:48 +0100
commit5530fab8f2636c08077cddf5a1ffcae2117e5161 (patch)
tree93070c852a05e2b3efbf636c2c1cfbf67dd05377
parent0756abd64157a53395f466af127cfe43745d1c43 (diff)
parent04ddf85bcc9d5ec06ef51537f5cbca97548716f3 (diff)
downloadvyos-1x-5530fab8f2636c08077cddf5a1ffcae2117e5161.tar.gz
vyos-1x-5530fab8f2636c08077cddf5a1ffcae2117e5161.zip
Merge pull request #684 from sever-sever/T3215
op-mode: T3215: Fix show ipv6 route overlaps in nodes
-rw-r--r--op-mode-definitions/ipv6-route.xml.in38
-rw-r--r--op-mode-definitions/show-ipv6-route.xml.in30
2 files changed, 30 insertions, 38 deletions
diff --git a/op-mode-definitions/ipv6-route.xml.in b/op-mode-definitions/ipv6-route.xml.in
index fbf6489ba..28f5b1aad 100644
--- a/op-mode-definitions/ipv6-route.xml.in
+++ b/op-mode-definitions/ipv6-route.xml.in
@@ -24,44 +24,6 @@
<command>ip -f inet6 neigh list</command>
</leafNode>
- <node name="route">
- <properties>
- <help>Show IPv6 routes</help>
- </properties>
- <children>
- <node name="cache">
- <properties>
- <help>Show kernel IPv6 route cache</help>
- </properties>
- <command>ip -s -f inet6 route list cache</command>
- </node>
- <tagNode name="cache">
- <properties>
- <help>Show kernel IPv6 route cache for a given route</help>
- <completionHelp>
- <list>&lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
- </completionHelp>
- </properties>
- <command>ip -s -f inet6 route list cache $5</command>
- </tagNode>
- <node name="forward">
- <properties>
- <help>Show kernel IPv6 route table</help>
- </properties>
- <command>ip -f inet6 route list</command>
- </node>
- <tagNode name="forward">
- <properties>
- <help>Show kernel IPv6 route table for a given route</help>
- <completionHelp>
- <list>&lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
- </completionHelp>
- </properties>
- <command>ip -s -f inet6 route list $5</command>
- </tagNode>
- </children>
- </node>
-
</children>
</node>
</children>
diff --git a/op-mode-definitions/show-ipv6-route.xml.in b/op-mode-definitions/show-ipv6-route.xml.in
index 9ac8687ab..065ea6f1f 100644
--- a/op-mode-definitions/show-ipv6-route.xml.in
+++ b/op-mode-definitions/show-ipv6-route.xml.in
@@ -19,12 +19,42 @@
</properties>
<command>vtysh -c "show ipv6 route bgp"</command>
</node>
+ <node name="cache">
+ <properties>
+ <help>Show kernel IPv6 route cache</help>
+ </properties>
+ <command>ip -s -f inet6 route list cache</command>
+ </node>
+ <tagNode name="cache">
+ <properties>
+ <help>Show kernel IPv6 route cache for a given route</help>
+ <completionHelp>
+ <list>&lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>ip -s -f inet6 route list cache $5</command>
+ </tagNode>
<node name="connected">
<properties>
<help>Show IPv6 connected routes</help>
</properties>
<command>vtysh -c "show ipv6 route connected"</command>
</node>
+ <node name="forward">
+ <properties>
+ <help>Show kernel IPv6 route table</help>
+ </properties>
+ <command>ip -f inet6 route list</command>
+ </node>
+ <tagNode name="forward">
+ <properties>
+ <help>Show kernel IPv6 route table for a given route</help>
+ <completionHelp>
+ <list>&lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>ip -s -f inet6 route list $5</command>
+ </tagNode>
<node name="isis">
<properties>
<help>Show IPv6 IS-IS routes</help>