diff options
author | Christian Poessinger <christian@poessinger.com> | 2018-11-07 14:33:19 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2018-11-07 14:33:19 +0100 |
commit | 3d3432b84dc7f8a588a94a981da089093507b9f3 (patch) | |
tree | 39888e6fe25889bbbd1d25699b258381dbe439f1 /op-mode-definitions | |
parent | c798e0821c4acbf7ff89e6d2aeb2807cd07f4152 (diff) | |
parent | 698c5a40b2ece2f3eb41ad932660f7ceb1f80092 (diff) | |
download | vyos-1x-3d3432b84dc7f8a588a94a981da089093507b9f3.tar.gz vyos-1x-3d3432b84dc7f8a588a94a981da089093507b9f3.zip |
Merge branch 'igmproxy' into current
* igmproxy:
T959: XML/Python rewrite of "protocol igmp-proxy" and op-mode commands
show-raid.xml: fixup indention
Add missing VyOS copyright notices
Diffstat (limited to 'op-mode-definitions')
-rw-r--r-- | op-mode-definitions/show-ip-multicast.xml | 30 | ||||
-rw-r--r-- | op-mode-definitions/show-raid.xml | 20 |
2 files changed, 39 insertions, 11 deletions
diff --git a/op-mode-definitions/show-ip-multicast.xml b/op-mode-definitions/show-ip-multicast.xml new file mode 100644 index 000000000..07102bfa6 --- /dev/null +++ b/op-mode-definitions/show-ip-multicast.xml @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="ip"> + <children> + <node name="multicast"> + <properties> + <help>Show IP multicast</help> + </properties> + <children> + <leafNode name="interface"> + <properties> + <help>Show multicast interfaces</help> + </properties> + <command>if ps -C igmpproxy &>/dev/null; then ${vyos_op_scripts_dir}/show-igmpproxy.py --interface; else echo IGMP proxy not configured; fi</command> + </leafNode> + <leafNode name="mfc"> + <properties> + <help>Show multicast fowarding cache</help> + </properties> + <command>if ps -C igmpproxy &>/dev/null; then ${vyos_op_scripts_dir}/show-igmpproxy.py --mfc; else echo IGMP proxy not configured; fi</command> + </leafNode> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-raid.xml b/op-mode-definitions/show-raid.xml index b0930742a..000fd4610 100644 --- a/op-mode-definitions/show-raid.xml +++ b/op-mode-definitions/show-raid.xml @@ -2,17 +2,15 @@ <interfaceDefinition> <node name="show"> <children> - <tagNode name="raid"> - <properties> - <help>Show statis of RAID set</help> - <completionHelp> - <script>${vyos_completion_dir}/list_raidset.sh</script> - </completionHelp> - </properties> - <command>${vyos_op_scripts_dir}/show_raid.sh $3</command> - - </tagNode> - + <tagNode name="raid"> + <properties> + <help>Show statis of RAID set</help> + <completionHelp> + <script>${vyos_completion_dir}/list_raidset.sh</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/show_raid.sh $3</command> + </tagNode> </children> </node> </interfaceDefinition> |