summaryrefslogtreecommitdiff
path: root/op-mode-definitions
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-11-30 08:47:37 +0100
committerGitHub <noreply@github.com>2024-11-30 08:47:37 +0100
commite5faa4dab2b3b52b6f2dbbcafa00f0922b185d4c (patch)
tree6c7a080f7c4546f0bb4b01215dac8e7c2f01831c /op-mode-definitions
parent645d627254c5dcccdc72ee3502d7717a1df35bfc (diff)
parent51c6930e5e498dd2aef2fcba0287884b17683390 (diff)
downloadvyos-1x-e5faa4dab2b3b52b6f2dbbcafa00f0922b185d4c.tar.gz
vyos-1x-e5faa4dab2b3b52b6f2dbbcafa00f0922b185d4c.zip
Merge pull request #4205 from natali-rs1985/T6909
op_mode: T6909: Move "show monitoring" and "show zebra" to "show monitoring frr"
Diffstat (limited to 'op-mode-definitions')
-rw-r--r--op-mode-definitions/show-monitoring.xml.in62
-rw-r--r--op-mode-definitions/show-zebra.xml.in54
2 files changed, 59 insertions, 57 deletions
diff --git a/op-mode-definitions/show-monitoring.xml.in b/op-mode-definitions/show-monitoring.xml.in
index 2651b3438..9fd60e45a 100644
--- a/op-mode-definitions/show-monitoring.xml.in
+++ b/op-mode-definitions/show-monitoring.xml.in
@@ -2,12 +2,68 @@
<interfaceDefinition>
<node name="show">
<children>
- <leafNode name="monitoring">
+ <node name="monitoring">
<properties>
<help>Show currently monitored services</help>
</properties>
- <command>vtysh -c "show debugging"</command>
- </leafNode>
+ <children>
+ <node name="frr">
+ <properties>
+ <help>Show currently monitored FRR services</help>
+ </properties>
+ <command>vtysh -c "show debugging"</command>
+ <children>
+ <node name="zebra">
+ <properties>
+ <help>Show Zebra routing information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+ <children>
+ <node name="client">
+ <properties>
+ <help>Client information</help>
+ </properties>
+ <children>
+ <node name="summary">
+ <properties>
+ <help>Brief summary</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+ </node>
+ </children>
+ </node>
+ <node name="dplane">
+ <properties>
+ <help>Zebra dataplane information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+ </node>
+ <node name="router">
+ <properties>
+ <help>Zebra router information</help>
+ </properties>
+ <children>
+ <node name="table">
+ <properties>
+ <help>Zebra routing table information</help>
+ </properties>
+ <children>
+ <node name="summary">
+ <properties>
+ <help>Summary information</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+ </node>
+ </children>
+ </node>
+ </children>
+ </node>
+ </children>
+ </node>
+ </children>
+ </node>
+ </children>
+ </node>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-zebra.xml.in b/op-mode-definitions/show-zebra.xml.in
deleted file mode 100644
index 69991a1d5..000000000
--- a/op-mode-definitions/show-zebra.xml.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
- <node name="show">
- <children>
- <node name="zebra">
- <properties>
- <help>Show Zebra routing information</help>
- </properties>
- <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
- <children>
- <node name="client">
- <properties>
- <help>Client information </help>
- </properties>
- <children>
- <node name="summary">
- <properties>
- <help>Brief Summary</help>
- </properties>
- <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
- </node>
- </children>
- </node>
- <node name="dplane">
- <properties>
- <help>Zebra dataplane information</help>
- </properties>
- <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
- </node>
- <node name="router">
- <properties>
- <help>Zebra Router Information</help>
- </properties>
- <children>
- <node name="table">
- <properties>
- <help>Table Information about this Zebra Router</help>
- </properties>
- <children>
- <node name="summary">
- <properties>
- <help>Summary Information</help>
- </properties>
- <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
- </node>
- </children>
- </node>
- </children>
- </node>
- </children>
- </node>
- </children>
- </node>
-</interfaceDefinition>