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 @@ + + + + Search by Any Link state ID + + <x.x.x.x> + + + vtysh -c "show ipv6 ospf6 database $5 * $7" + + + + Show detailed information + + vtysh -c "show ipv6 ospf6 database $5 * $7 detail" + + + + Show dump of LSAs + + vtysh -c "show ipv6 ospf6 database $5 * $7 dump" + + + + Show internal LSA information + + vtysh -c "show ipv6 ospf6 database $5 * $7 internal" + + + + 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 @@ - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)" #include #include #include + + + Show detailed information + + vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)" + + + + Show dump of LSAs + + vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)" + + + + Show internal LSA information + + vtysh -c "show ipv6 ospf6 database * $(echo $@ | cut -d' ' -f6-)" + 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 @@ Show detailed information - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" 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 @@ Show dump of LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" 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 @@ Show internal LSA information - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" 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 @@ <x.x.x.x> - - vtysh -c "show ipv6 ospf6 ${@:4}" - #include - #include - #include - #include + #include + + + Show Self-originated LSAs + + + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" + + #include + #include + #include + + 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 @@ <x.x.x.x> + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" - #include #include #include 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 @@ Show Self-originated LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include #include #include + #include 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 @@ protocols ospfv3 area - vtysh -c "show ipv6 ospf6 area $4 spf tree" + vtysh -c "show ipv6 ospf6 area $5 spf tree" @@ -35,7 +35,7 @@ <x.x.x.x> - vtysh -c "show ipv6 ospf6 simulate spf-tree $7 $4 $5" + vtysh -c "show ipv6 ospf6 simulate spf-tree $7 area $5" @@ -63,6 +63,14 @@ vtysh -c "show ipv6 ospf6 database" + + + Search by Advertising Router ID + + + #include + + Search by Advertising Router ID @@ -81,89 +89,90 @@ - Search by Link state ID + Search by Any Link state ID <x.x.x.x> - #include - #include - #include + + + Show detailed information + + vtysh -c "show ipv6 ospf6 database * * $7 detail" + + + + Show dump of LSAs + + vtysh -c "show ipv6 ospf6 database * * $7 dump" + + + + Show internal LSA information + + vtysh -c "show ipv6 ospf6 database * * $7 internal" + - - - - - Search by Link state ID - - <x.x.x.x> - - - vtysh -c "show ipv6 ospf6 database * $6" - - #include - #include - #include - #include - - - - - Show AS-External LSAs - - vtysh -c "show ipv6 ospf6 database as-external" - - #include - + - Search by Advertising Router ID + Search by Link state ID <x.x.x.x> - vtysh -c "show ipv6 ospf6 database as-external * $7" + vtysh -c "show ipv6 ospf6 database * $6" - #include - #include - #include + #include + + + Show detailed information + + vtysh -c "show ipv6 ospf6 database * $6 detail" + + + + Show dump of LSAs + + vtysh -c "show ipv6 ospf6 database * $6 dump" + + + + Show internal LSA information + + vtysh -c "show ipv6 ospf6 database * $6 internal" + - - #include - #include - #include - #include - #include + - + - Search by Advertising Router IDs - - <x.x.x.x> - + Show AS-External LSAs + vtysh -c "show ipv6 ospf6 database as-external" + #include + #include #include #include #include + #include + #include #include - #include - + #include - #include - #include - #include Show Group-Membership LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -172,14 +181,16 @@ #include + #include Show Inter-Area-Prefix LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -193,9 +204,10 @@ Show Inter-Area-Router LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -209,9 +221,10 @@ Show Intra-Area-Prefix LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -225,9 +238,10 @@ Show Link LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -236,14 +250,29 @@ #include + + + Search by Link state ID + + <x.x.x.x> + + + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" + + #include + #include + #include + + Show Network LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -252,14 +281,15 @@ #include - + - Show LSAs + Show router LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -268,20 +298,16 @@ #include - + - Show router LSAs + Show Self-originated LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" - #include #include #include #include - #include - #include - #include @@ -289,9 +315,10 @@ Show Type-7 LSAs - vtysh -c "show ipv6 ospf6 ${@:4}" + vtysh -c "show ipv6 ospf6 $(echo $@ | cut -d' ' -f4-)" #include + #include #include #include #include @@ -381,18 +408,34 @@ #include - + Show linkstate Network information + + <x.x.x.x> + - vtysh -c "show ipv6 ospf6 linkstate network" - - + + + + Search by Link state ID + + <x.x.x.x> + + + vtysh -c "show ipv6 ospf6 linkstate network $6 $8" + + + + Show linkstate Router information + + <x.x.x.x> + - vtysh -c "show ipv6 ospf6 linkstate router" - + vtysh -c "show ipv6 ospf6 linkstate router $6" + @@ -410,6 +453,15 @@ + + + Show specified neighbor information + + <x.x.x.x> + + + vtysh -c "show ipv6 ospf6 neighbor $5" + Show OSPFv3 redistribute external information