diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-04-27 22:12:11 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-04-27 22:25:18 +0200 |
| commit | cf998c040c371be20be8035895989fcee3c06429 (patch) | |
| tree | 3632589b8e6f15e4fd7c1816b9458af495ca8992 | |
| parent | c76389156c41414a3a4e381535151607a42fb06f (diff) | |
| download | vyos-1x-cf998c040c371be20be8035895989fcee3c06429.tar.gz vyos-1x-cf998c040c371be20be8035895989fcee3c06429.zip | |
op-mode: ospfv3: T3335: re-use common vtysh_wrapper.sh wrapper
Instead of renaming the OSPFv3 commands for every individual XML invocation,
also re-use the common helper shell script. One source, one truth!
16 files changed, 239 insertions, 237 deletions
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 deleted file mode 100644 index 312ce2a4f..000000000 --- a/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i +++ /dev/null @@ -1,17 +0,0 @@ -<!-- included start from ospfv3-adv-router-id-node-tag.xml.i --> -<node name="node.tag"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <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> - </children> -</node> -<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-detail.xml.i b/op-mode-definitions/include/ospfv3-detail.xml.i deleted file mode 100644 index 76096fbc8..000000000 --- a/op-mode-definitions/include/ospfv3-detail.xml.i +++ /dev/null @@ -1,9 +0,0 @@ -<!-- included start from ospfv3-detail.xml.i --> -<node name="detail"> - <properties> - <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> -</node> -<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-dump.xml.i b/op-mode-definitions/include/ospfv3-dump.xml.i deleted file mode 100644 index 4271aec53..000000000 --- a/op-mode-definitions/include/ospfv3-dump.xml.i +++ /dev/null @@ -1,9 +0,0 @@ -<!-- included start from ospfv3-dump.xml.i --> -<node name="dump"> - <properties> - <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> -</node> -<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-internal.xml.i b/op-mode-definitions/include/ospfv3-internal.xml.i deleted file mode 100644 index 8b45e86c1..000000000 --- a/op-mode-definitions/include/ospfv3-internal.xml.i +++ /dev/null @@ -1,9 +0,0 @@ -<!-- included start from ospfv3-internal.xml.i --> -<node name="internal"> - <properties> - <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> -</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 deleted file mode 100644 index 24b549d28..000000000 --- a/op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i +++ /dev/null @@ -1,18 +0,0 @@ -<!-- included start from ospfv3-linkstate-id-node-tag.xml.i --> -<node name="node.tag"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <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> - </children> -</node> -<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-self-originated.xml.i b/op-mode-definitions/include/ospfv3-self-originated.xml.i deleted file mode 100644 index 180bca6f6..000000000 --- a/op-mode-definitions/include/ospfv3-self-originated.xml.i +++ /dev/null @@ -1,14 +0,0 @@ -<!-- included start from ospfv3-self-originated.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 ${@:4}"</command> - <children> - #include <include/ospfv3-detail.xml.i> - #include <include/ospfv3-dump.xml.i> - #include <include/ospfv3-internal.xml.i> - </children> -</node> -<!-- 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 new file mode 100644 index 000000000..a1bd67a90 --- /dev/null +++ b/op-mode-definitions/include/ospfv3/adv-router-id-node-tag.xml.i @@ -0,0 +1,16 @@ +<!-- included start from ospfv3/adv-router-id-node-tag.xml.i --> +<node name="node.tag"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/ospfv3/detail.xml.i> + #include <include/ospfv3/dump.xml.i> + #include <include/ospfv3/internal.xml.i> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-adv-router.xml.i b/op-mode-definitions/include/ospfv3/adv-router.xml.i index d17538d4d..a14fc39db 100644 --- a/op-mode-definitions/include/ospfv3-adv-router.xml.i +++ b/op-mode-definitions/include/ospfv3/adv-router.xml.i @@ -1,4 +1,4 @@ -<!-- included start from ospfv3-adv-router.xml.i --> +<!-- included start from ospfv3/adv-router.xml.i --> <tagNode name="adv-router"> <properties> <help>Search by Advertising Router ID</help> @@ -7,10 +7,10 @@ </completionHelp> </properties> <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> + #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> </tagNode> <!-- included end --> diff --git a/op-mode-definitions/include/ospfv3/detail.xml.i b/op-mode-definitions/include/ospfv3/detail.xml.i new file mode 100644 index 000000000..4e3c91268 --- /dev/null +++ b/op-mode-definitions/include/ospfv3/detail.xml.i @@ -0,0 +1,8 @@ +<!-- included start from ospfv3/detail.xml.i --> +<node name="detail"> + <properties> + <help>Show detailed information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3/dump.xml.i b/op-mode-definitions/include/ospfv3/dump.xml.i new file mode 100644 index 000000000..55e10a5ee --- /dev/null +++ b/op-mode-definitions/include/ospfv3/dump.xml.i @@ -0,0 +1,8 @@ +<!-- included start from ospfv3/dump.xml.i --> +<node name="dump"> + <properties> + <help>Show dump of LSAs</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3/internal.xml.i b/op-mode-definitions/include/ospfv3/internal.xml.i new file mode 100644 index 000000000..ac7c61e6f --- /dev/null +++ b/op-mode-definitions/include/ospfv3/internal.xml.i @@ -0,0 +1,8 @@ +<!-- included start from ospfv3/internal.xml.i --> +<node name="internal"> + <properties> + <help>Show internal LSA information</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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 new file mode 100644 index 000000000..ee3863b35 --- /dev/null +++ b/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i @@ -0,0 +1,17 @@ +<!-- included start from ospfv3/linkstate-id-node-tag.xml.i --> +<node name="node.tag"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + </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 eab5916f1..9ead17c20 100644 --- a/op-mode-definitions/include/ospfv3-linkstate-id.xml.i +++ b/op-mode-definitions/include/ospfv3/linkstate-id.xml.i @@ -1,4 +1,4 @@ -<!-- included start from ospfv3-linkstate-id.xml.i --> +<!-- included start from ospfv3/linkstate-id.xml.i --> <tagNode name="linkstate-id"> <properties> <help>Search by Link state ID</help> @@ -7,9 +7,9 @@ </completionHelp> </properties> <children> - #include <include/ospfv3-detail.xml.i> - #include <include/ospfv3-dump.xml.i> - #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3/detail.xml.i> + #include <include/ospfv3/dump.xml.i> + #include <include/ospfv3/internal.xml.i> </children> </tagNode> <!-- included end --> diff --git a/op-mode-definitions/include/ospfv3/self-originated.xml.i b/op-mode-definitions/include/ospfv3/self-originated.xml.i new file mode 100644 index 000000000..734f3f8ad --- /dev/null +++ b/op-mode-definitions/include/ospfv3/self-originated.xml.i @@ -0,0 +1,13 @@ +<!-- included start from ospfv3/self-originated.xml.i --> +<node name="self-originated"> + <properties> + <help>Show Self-originated LSAs</help> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + <children> + #include <include/ospfv3/detail.xml.i> + #include <include/ospfv3/dump.xml.i> + #include <include/ospfv3/internal.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 9227fdae1..e6c8a6700 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> @@ -43,9 +43,9 @@ <properties> <help>Show OSPFv3 border-router (ABR and ASBR) information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> <tagNode name="border-routers"> @@ -55,13 +55,13 @@ <list><x.x.x.x></list> </completionHelp> </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers $5"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </tagNode> <node name="database"> <properties> <help>Show OSPFv3 Link state database information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 database"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> <tagNode name="adv-router"> <properties> @@ -71,7 +71,7 @@ </completionHelp> </properties> <children> - #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3/linkstate-id.xml.i> </children> </tagNode> <node name="any"> @@ -87,9 +87,9 @@ </completionHelp> </properties> <children> - #include <include/ospfv3-detail.xml.i> - #include <include/ospfv3-dump.xml.i> - #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3/detail.xml.i> + #include <include/ospfv3/dump.xml.i> + #include <include/ospfv3/internal.xml.i> </children> </tagNode> </children> @@ -103,19 +103,19 @@ </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> + #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> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-adv-router.xml.i> + #include <include/ospfv3/adv-router.xml.i> <tagNode name="any"> <properties> <help>Search by Advertising Router ID</help> @@ -125,16 +125,16 @@ </properties> <command>vtysh -c "show ipv6 ospf6 database as-external * $7"</command> <children> - #include <include/ospfv3-detail.xml.i> - #include <include/ospfv3-dump.xml.i> - #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3/detail.xml.i> + #include <include/ospfv3/dump.xml.i> + #include <include/ospfv3/internal.xml.i> </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> + #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> </children> </node> <tagNode name="as-external"> @@ -145,159 +145,150 @@ </completionHelp> </properties> <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> + #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> </children> </tagNode> - #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> + #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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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="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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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="inter-router"> <properties> <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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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="intra-prefix"> <properties> <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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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="link"> <properties> <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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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="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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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="node.tag"> <properties> <help>Show LSAs</help> </properties> - <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> - <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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="router"> <properties> <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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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"> <properties> <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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</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> + #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> </children> @@ -306,15 +297,15 @@ <properties> <help>Show OSPFv3 interface information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 interface"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> <node name="prefix"> <properties> <help>Show connected prefixes to advertise</help> </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> <tagNode name="prefix"> @@ -324,14 +315,14 @@ <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> </completionHelp> </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> <node name="match"> <properties> <help>Matched interface prefix information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6 match"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </node> </children> </tagNode> @@ -344,15 +335,15 @@ <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> <node name="prefix"> <properties> <help>Show connected prefixes to advertise</help> </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> <tagNode name="prefix"> @@ -362,14 +353,14 @@ <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> </completionHelp> </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> <node name="match"> <properties> <help>Matched interface prefix information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7 match"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </node> </children> </tagNode> @@ -380,33 +371,49 @@ <help>Show OSPFv3 linkstate routing information</help> </properties> <children> - #include <include/ospfv3-detail.xml.i> - <node name="network"> + #include <include/ospfv3/detail.xml.i> + <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> + <node name="node.tag"> + <properties> + <help>Specify Link state ID as IPv4 address notation</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </node> + </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>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> + </tagNode> </children> </node> <node name="neighbor"> <properties> <help>Show OSPFv3 neighbor information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> <node name="drchoice"> <properties> <help>Show neighbor DR choice information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor drchoice"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </node> </children> </node> @@ -414,56 +421,56 @@ <properties> <help>Show OSPFv3 redistribute external information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 redistribute"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </node> <node name="route"> <properties> <help>Show OSPFv3 routing table information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> <node name="external-1"> <properties> <help>Show Type-1 External route information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route external-1"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> <node name="external-2"> <properties> <help>Show Type-2 External route information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route external-2"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> <node name="inter-area"> <properties> <help>Show Inter-Area route information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route inter-area"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> <node name="intra-area"> <properties> <help>Show Intra-Area route information</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route intra-area"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> <node name="summary"> <properties> <help>Show route table summary</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route summary"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </node> </children> </node> @@ -474,21 +481,21 @@ <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> </completionHelp> </properties> - <command>vtysh -c "show ipv6 ospf6 route $5"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> <node name="longer"> <properties> <help>Show routes longer than specified prefix</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 longer"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> </node> <node name="match"> <properties> <help>Show routes matching specified prefix</help> </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 match"</command> + <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command> <children> - #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3/detail.xml.i> </children> </node> </children> diff --git a/src/op_mode/vtysh_wrapper.sh b/src/op_mode/vtysh_wrapper.sh index 47d88330b..09980e14f 100755 --- a/src/op_mode/vtysh_wrapper.sh +++ b/src/op_mode/vtysh_wrapper.sh @@ -1,4 +1,5 @@ #!/bin/sh declare -a tmp -tmp=$@ +# FRR uses ospf6 where we use ospfv3, thus alter the command +tmp=$(echo $@ | sed -e "s/ospfv3/ospf6/") vtysh -c "$tmp" |