Page Menu
Home
VyOS Platform
Search
Configure Global Search
Log In
Files
F1144305
170-ospfv3_fixes.patch
All Users
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
wsapplegate
Feb 18 2021, 5:43 AM
2021-02-18 05:43:43 (UTC+0)
Size
26 KB
Referenced Files
None
Subscribers
None
170-ospfv3_fixes.patch
View Options
diff --git a/op-mode-definitions/include/ospfv3-any-linkstate-id.xml.i b/op-mode-definitions/include/ospfv3-any-linkstate-id.xml.i
index 58216bfd..42643a0d 100644
--- a/op-mode-definitions/include/ospfv3-any-linkstate-id.xml.i
+++ b/op-mode-definitions/include/ospfv3-any-linkstate-id.xml.i
@@ -0,0 +1,28 @@
+<!-- included start from ospfv3-any-linkstate-id.xml.i -->
+<tagNode name="any">
+ <properties>
+ <help>Search by Any Link state ID</help>
+ <completionHelp>
+ <list><x.x.x.x></list>
+ </completionHelp>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database $5 * $7"</command>
+ <children>
+ <node name="detail">
+ <properties>
+ <help>Show detailed information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database $5 * $7 detail"</command>
+ </node>
+ <node name="dump">
+ <properties>
+ <help>Show dump of LSAs</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database $5 * $7 dump"</command>
+ </node>
+ <node name="internal">
+ <properties>
+ <help>Show internal LSA information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database $5 * $7 internal"</command>
+ </node>
+ </children>
+</tagNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i b/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i
index 312ce2a4..d3cd7ad1 100644
--- a/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i
+++ b/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i
@@ -7,11 +7,29 @@
</completionHelp>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)"</command>
<children>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
+ <node name="detail">
+ <properties>
+ <help>Show detailed information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)"</command>
+ </node>
+ <node name="dump">
+ <properties>
+ <help>Show dump of LSAs</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)"</command>
+ </node>
+ <node name="internal">
+ <properties>
+ <help>Show internal LSA information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)"</command>
+ </node>
</children>
</node>
<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-detail.xml.i b/op-mode-definitions/include/ospfv3-detail.xml.i
index 76096fbc..33f1d223 100644
--- a/op-mode-definitions/include/ospfv3-detail.xml.i
+++ b/op-mode-definitions/include/ospfv3-detail.xml.i
@@ -4,6 +4,6 @@
<help>Show detailed information</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
</node>
<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-dump.xml.i b/op-mode-definitions/include/ospfv3-dump.xml.i
index 4271aec5..d20e36ae 100644
--- a/op-mode-definitions/include/ospfv3-dump.xml.i
+++ b/op-mode-definitions/include/ospfv3-dump.xml.i
@@ -4,6 +4,6 @@
<help>Show dump of LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
</node>
<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-internal.xml.i b/op-mode-definitions/include/ospfv3-internal.xml.i
index 8b45e86c..e5c45844 100644
--- a/op-mode-definitions/include/ospfv3-internal.xml.i
+++ b/op-mode-definitions/include/ospfv3-internal.xml.i
@@ -4,6 +4,6 @@
<help>Show internal LSA information</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
</node>
<!-- included end -->
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 24b549d2..42f9d351 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
@@ -6,13 +6,20 @@
<list><x.x.x.x></list>
</completionHelp>
</properties>
- <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
<children>
- #include <include/ospfv3-detail.xml.i>
- #include <include/ospfv3-dump.xml.i>
- #include <include/ospfv3-internal.xml.i>
- #include <include/ospfv3-self-originated.xml.i>
+ #include <include/ospfv3-adv-router-id-node-tag.xml.i>
+ <node name="self-originated">
+ <properties>
+ <help>Show Self-originated LSAs</help>
+ </properties>
+ <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
+ <children>
+ #include <include/ospfv3-detail.xml.i>
+ #include <include/ospfv3-dump.xml.i>
+ #include <include/ospfv3-internal.xml.i>
+ </children>
+ </node>
</children>
</node>
<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-linkstate-id.xml.i b/op-mode-definitions/include/ospfv3-linkstate-id.xml.i
index eab5916f..04c25c0c 100644
--- a/op-mode-definitions/include/ospfv3-linkstate-id.xml.i
+++ b/op-mode-definitions/include/ospfv3-linkstate-id.xml.i
@@ -6,8 +6,8 @@
<list><x.x.x.x></list>
</completionHelp>
</properties>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
- #include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
</children>
diff --git a/op-mode-definitions/include/ospfv3-self-originated.xml.i b/op-mode-definitions/include/ospfv3-self-originated.xml.i
index 180bca6f..0c0fc6ee 100644
--- a/op-mode-definitions/include/ospfv3-self-originated.xml.i
+++ b/op-mode-definitions/include/ospfv3-self-originated.xml.i
@@ -4,11 +4,12 @@
<help>Show Self-originated LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
+ #include <include/ospfv3-linkstate-id.xml.i>
</children>
</node>
<!-- included end -->
diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml.in b/op-mode-definitions/show-ipv6-ospfv3.xml.in
index 9227fdae..2680c115 100644
--- a/op-mode-definitions/show-ipv6-ospfv3.xml.in
+++ b/op-mode-definitions/show-ipv6-ospfv3.xml.in
@@ -26,7 +26,7 @@
<path>protocols ospfv3 area</path>
</completionHelp>
</properties>
- <command>vtysh -c "show ipv6 ospf6 area $4 spf tree"</command>
+ <command>vtysh -c "show ipv6 ospf6 area $5 spf tree"</command>
<children>
<tagNode name="router">
<properties>
@@ -35,7 +35,7 @@
<list><x.x.x.x></list>
</completionHelp>
</properties>
- <command>vtysh -c "show ipv6 ospf6 simulate spf-tree $7 $4 $5"</command>
+ <command>vtysh -c "show ipv6 ospf6 simulate spf-tree $7 area $5"</command>
</tagNode>
</children>
</tagNode>
@@ -63,6 +63,14 @@
</properties>
<command>vtysh -c "show ipv6 ospf6 database"</command>
<children>
+ <node name="adv-router">
+ <properties>
+ <help>Search by Advertising Router ID</help>
+ </properties>
+ <children>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
+ </children>
+ </node>
<tagNode name="adv-router">
<properties>
<help>Search by Advertising Router ID</help>
@@ -81,89 +89,90 @@
<children>
<tagNode name="any">
<properties>
- <help>Search by Link state ID</help>
+ <help>Search by Any Link state ID</help>
<completionHelp>
<list><x.x.x.x></list>
</completionHelp>
</properties>
<children>
- #include <include/ospfv3-detail.xml.i>
- #include <include/ospfv3-dump.xml.i>
- #include <include/ospfv3-internal.xml.i>
+ <node name="detail">
+ <properties>
+ <help>Show detailed information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * * $7 detail"</command>
+ </node>
+ <node name="dump">
+ <properties>
+ <help>Show dump of LSAs</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * * $7 dump"</command>
+ </node>
+ <node name="internal">
+ <properties>
+ <help>Show internal LSA information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * * $7 internal"</command>
+ </node>
</children>
</tagNode>
- </children>
- </node>
- <tagNode name="any">
- <properties>
- <help>Search by Link state ID</help>
- <completionHelp>
- <list><x.x.x.x></list>
- </completionHelp>
- </properties>
- <command>vtysh -c "show ipv6 ospf6 database * $6"</command>
- <children>
- #include <include/ospfv3-detail.xml.i>
- #include <include/ospfv3-dump.xml.i>
- #include <include/ospfv3-internal.xml.i>
- #include <include/ospfv3-adv-router-id-node-tag.xml.i>
- </children>
- </tagNode>
- <node name="as-external">
- <properties>
- <help>Show AS-External LSAs</help>
- </properties>
- <command>vtysh -c "show ipv6 ospf6 database as-external"</command>
- <children>
- #include <include/ospfv3-adv-router.xml.i>
- <tagNode name="any">
+ <node name="node.tag">
<properties>
- <help>Search by Advertising Router ID</help>
+ <help>Search by Link state ID</help>
<completionHelp>
<list><x.x.x.x></list>
</completionHelp>
</properties>
- <command>vtysh -c "show ipv6 ospf6 database as-external * $7"</command>
+ <command>vtysh -c "show ipv6 ospf6 database * $6"</command>
<children>
- #include <include/ospfv3-detail.xml.i>
- #include <include/ospfv3-dump.xml.i>
- #include <include/ospfv3-internal.xml.i>
+ #include <include/ospfv3-adv-router-id-node-tag.xml.i>
+ <node name="detail">
+ <properties>
+ <help>Show detailed information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * $6 detail"</command>
+ </node>
+ <node name="dump">
+ <properties>
+ <help>Show dump of LSAs</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * $6 dump"</command>
+ </node>
+ <node name="internal">
+ <properties>
+ <help>Show internal LSA information</help>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 database * $6 internal"</command>
+ </node>
</children>
- </tagNode>
- #include <include/ospfv3-detail.xml.i>
- #include <include/ospfv3-dump.xml.i>
- #include <include/ospfv3-internal.xml.i>
- #include <include/ospfv3-linkstate-id.xml.i>
- #include <include/ospfv3-self-originated.xml.i>
+ </node>
</children>
</node>
- <tagNode name="as-external">
+ <node name="as-external">
<properties>
- <help>Search by Advertising Router IDs</help>
- <completionHelp>
- <list><x.x.x.x></list>
- </completionHelp>
+ <help>Show AS-External LSAs</help>
</properties>
+ <command>vtysh -c "show ipv6 ospf6 database as-external"</command>
<children>
+ #include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
+ #include <include/ospfv3-linkstate-id.xml.i>
+ #include <include/ospfv3-linkstate-id-node-tag.xml.i>
#include <include/ospfv3-self-originated.xml.i>
- #include <include/ospfv3-adv-router-id-node-tag.xml.i>
</children>
- </tagNode>
+ </node>
#include <include/ospfv3-detail.xml.i>
- #include <include/ospfv3-internal.xml.i>
- #include <include/ospfv3-linkstate-id.xml.i>
- #include <include/ospfv3-self-originated.xml.i>
<node name="group-membership">
<properties>
<help>Show Group-Membership LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -172,14 +181,16 @@
#include <include/ospfv3-self-originated.xml.i>
</children>
</node>
+ #include <include/ospfv3-internal.xml.i>
<node name="inter-prefix">
<properties>
<help>Show Inter-Area-Prefix LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -193,9 +204,10 @@
<help>Show Inter-Area-Router LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -209,9 +221,10 @@
<help>Show Intra-Area-Prefix LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -225,9 +238,10 @@
<help>Show Link LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -236,14 +250,29 @@
#include <include/ospfv3-self-originated.xml.i>
</children>
</node>
+ <tagNode name="linkstate-id">
+ <properties>
+ <help>Search by Link state ID</help>
+ <completionHelp>
+ <list><x.x.x.x></list>
+ </completionHelp>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
+ <children>
+ #include <include/ospfv3-detail.xml.i>
+ #include <include/ospfv3-dump.xml.i>
+ #include <include/ospfv3-internal.xml.i>
+ </children>
+ </tagNode>
<node name="network">
<properties>
<help>Show Network LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -252,14 +281,15 @@
#include <include/ospfv3-self-originated.xml.i>
</children>
</node>
- <node name="node.tag">
+ <node name="router">
<properties>
- <help>Show LSAs</help>
+ <help>Show router LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -268,20 +298,16 @@
#include <include/ospfv3-self-originated.xml.i>
</children>
</node>
- <node name="router">
+ <node name="self-originated">
<properties>
- <help>Show router LSAs</help>
+ <help>Show Self-originated LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
- #include <include/ospfv3-adv-router.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
- #include <include/ospfv3-linkstate-id.xml.i>
- #include <include/ospfv3-linkstate-id-node-tag.xml.i>
- #include <include/ospfv3-self-originated.xml.i>
</children>
</node>
<node name="type-7">
@@ -289,9 +315,10 @@
<help>Show Type-7 LSAs</help>
</properties>
<!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
- <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
+ <command>vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)"</command>
<children>
#include <include/ospfv3-adv-router.xml.i>
+ #include <include/ospfv3-any-linkstate-id.xml.i>
#include <include/ospfv3-detail.xml.i>
#include <include/ospfv3-dump.xml.i>
#include <include/ospfv3-internal.xml.i>
@@ -381,18 +408,34 @@
</properties>
<children>
#include <include/ospfv3-detail.xml.i>
- <node name="network">
+ <tagNode name="network">
<properties>
<help>Show linkstate Network information</help>
+ <completionHelp>
+ <list><x.x.x.x></list>
+ </completionHelp>
</properties>
- <command>vtysh -c "show ipv6 ospf6 linkstate network"</command>
- </node>
- <node name="router">
+ <children>
+ <tagNode name="linkstate-id">
+ <properties>
+ <help>Search by Link state ID</help>
+ <completionHelp>
+ <list><x.x.x.x></list>
+ </completionHelp>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 linkstate network $6 $8"</command>
+ </tagNode>
+ </children>
+ </tagNode>
+ <tagNode name="router">
<properties>
<help>Show linkstate Router information</help>
+ <completionHelp>
+ <list><x.x.x.x></list>
+ </completionHelp>
</properties>
- <command>vtysh -c "show ipv6 ospf6 linkstate router"</command>
- </node>
+ <command>vtysh -c "show ipv6 ospf6 linkstate router $6"</command>
+ </tagNode>
</children>
</node>
<node name="neighbor">
@@ -410,6 +453,15 @@
</node>
</children>
</node>
+ <tagNode name="neighbor">
+ <properties>
+ <help>Show specified neighbor information</help>
+ <completionHelp>
+ <list><x.x.x.x></list>
+ </completionHelp>
+ </properties>
+ <command>vtysh -c "show ipv6 ospf6 neighbor $5"</command>
+ </tagNode>
<node name="redistribute">
<properties>
<help>Show OSPFv3 redistribute external information</help>
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f4/2b/d829880185b93e7edfb35f96aa7f
Default Alt Text
170-ospfv3_fixes.patch (26 KB)
Attached To
Mode
T3335: Some OSPFv3 show commands do not work
Attached
Detach File
Event Timeline
Log In to Comment