diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-07-09 17:33:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 17:33:34 +0200 |
| commit | 021765700a8ae5faa37de0aba9ee31ce4a46626f (patch) | |
| tree | ba763d6e1d37909cd67b929c98889950ba7163b0 | |
| parent | e6bce67f2ab25541f4a20e3147ea32ff0464aa9d (diff) | |
| parent | db593954f7889a7486bed3f6e920548784d8a9bf (diff) | |
| download | vyos-1x-021765700a8ae5faa37de0aba9ee31ce4a46626f.tar.gz vyos-1x-021765700a8ae5faa37de0aba9ee31ce4a46626f.zip | |
Merge pull request #913 from jack9603301/T3667
op-mode: brctl: T3667: Using bridge command structure instead of brctl
| -rw-r--r-- | op-mode-definitions/show-bridge.xml.in | 28 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-bridge.xml.in | 6 |
2 files changed, 17 insertions, 17 deletions
diff --git a/op-mode-definitions/show-bridge.xml.in b/op-mode-definitions/show-bridge.xml.in index 78c350e44..9bb8f137c 100644 --- a/op-mode-definitions/show-bridge.xml.in +++ b/op-mode-definitions/show-bridge.xml.in @@ -6,7 +6,13 @@ <properties> <help>Show bridging information</help> </properties> - <command>/sbin/brctl show</command> + <command>bridge -c link show</command> + </leafNode> + <leafNode name="vlan"> + <properties> + <help>View the VLAN filter settings of the bridge</help> + </properties> + <command>bridge -c vlan show</command> </leafNode> <tagNode name="bridge"> <properties> @@ -15,25 +21,25 @@ <script>${vyos_completion_dir}/list_interfaces.py --type bridge</script> </completionHelp> </properties> - <command>/sbin/brctl show $3</command> + <command>bridge -c link show br $3</command> <children> - <leafNode name="macs"> + <leafNode name="mdb"> <properties> - <help>Show bridge Media Access Control (MAC) address table</help> + <help>Displays the multicast group database for the bridge</help> </properties> - <command>/sbin/brctl showmacs $3</command> + <command>bridge -c fdb show br $3</command> </leafNode> - <leafNode name="spanning-tree"> + <leafNode name="fdb"> <properties> - <help>Show bridge spanning tree information</help> + <help>Show the forwarding database of the bridge</help> </properties> - <command>/sbin/brctl showstp $3</command> + <command>bridge -c fdb show br $3</command> </leafNode> - <leafNode name="fdb"> + <leafNode name="vlan"> <properties> - <help>Show the forwarding database of the bridge</help> + <help>View the VLAN filter settings of the bridge</help> </properties> - <command>/usr/sbin/bridge -c fdb show br $3</command> + <command>bridge -c vlan show br $3</command> </leafNode> </children> </tagNode> diff --git a/op-mode-definitions/show-interfaces-bridge.xml.in b/op-mode-definitions/show-interfaces-bridge.xml.in index cc4b248b6..85fde95b5 100644 --- a/op-mode-definitions/show-interfaces-bridge.xml.in +++ b/op-mode-definitions/show-interfaces-bridge.xml.in @@ -33,12 +33,6 @@ </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=bridge --action=show</command> </leafNode> - <leafNode name="vlan"> - <properties> - <help>View the VLAN filter settings of the bridge</help> - </properties> - <command>/usr/sbin/bridge -c vlan show</command> - </leafNode> </children> </node> </children> |