diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-03-18 06:46:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-18 06:46:29 +0000 |
| commit | 5b6dd9263ba063a1c867c7dc0952910e209b2d30 (patch) | |
| tree | f841ef030ba9b521f58f8d5029fffe9c1ac8c6e2 | |
| parent | 91c5b76719f178b39beed380443a6d588c3dc08b (diff) | |
| parent | d91457beca3a9b8e3ab96886c0aae45af68e5df5 (diff) | |
| download | vyos-1x-5b6dd9263ba063a1c867c7dc0952910e209b2d30.tar.gz vyos-1x-5b6dd9263ba063a1c867c7dc0952910e209b2d30.zip | |
Merge pull request #5061 from natali-rs1985/T8394
vpp: T8394: Move op-mode command 'show vpp lacp/bridge' to 'show interfaces vpp'
| -rw-r--r-- | op-mode-definitions/show_vpp_interfaces.xml.in | 63 | ||||
| -rw-r--r-- | op-mode-definitions/vpp-bridge.xml.in | 36 | ||||
| -rw-r--r-- | op-mode-definitions/vpp_lacp.xml.in | 42 |
3 files changed, 63 insertions, 78 deletions
diff --git a/op-mode-definitions/show_vpp_interfaces.xml.in b/op-mode-definitions/show_vpp_interfaces.xml.in index cb3775d4d..c26514813 100644 --- a/op-mode-definitions/show_vpp_interfaces.xml.in +++ b/op-mode-definitions/show_vpp_interfaces.xml.in @@ -34,6 +34,69 @@ </standalone> <command>sudo ${vyos_op_scripts_dir}/show_vpp_interfaces.py --hardware --intf-name="$5"</command> </tagNode> + <node name="bridge"> + <properties> + <help>Show VPP bridge information</help> + </properties> + <command>${vyos_op_scripts_dir}/vpp.py show_bridge</command> + <children> + <virtualTagNode> + <properties> + <help>Show bridge information for specified interface</help> + <completionHelp> + <path>interfaces vpp bridge</path> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vpp.py show_bridge --ifname=$5</command> + <children> + <leafNode name="detail"> + <properties> + <help>Show detailed bridge domain information</help> + </properties> + <command>${vyos_op_scripts_dir}/vpp.py show_bridge_details --ifname=$5</command> + </leafNode> + </children> + </virtualTagNode> + </children> + </node> + <node name="bonding"> + <properties> + <help>Show VPP bonding information</help> + </properties> + <children> + <node name="lacp"> + <properties> + <help>Show VPP LACP information</help> + </properties> + <command>${vyos_op_scripts_dir}/vpp.py show_lacp</command> + <children> + <virtualTagNode> + <properties> + <help>Show specific interface LACP information</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces --bondable</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/vpp.py show_lacp --ifname=$6</command> + <children> + <leafNode name="detail"> + <properties> + <help>Show interface LACP details</help> + </properties> + <command>${vyos_op_scripts_dir}/vpp.py show_lacp_details --ifname=$6</command> + </leafNode> + </children> + </virtualTagNode> + <leafNode name="detail"> + <properties> + <help>Show LACP detailed information</help> + </properties> + <command>${vyos_op_scripts_dir}/vpp.py show_lacp_details</command> + </leafNode> + </children> + </node> + </children> + </node> </children> <command>sudo ${vyos_op_scripts_dir}/show_vpp_interfaces.py --summary</command> </node> diff --git a/op-mode-definitions/vpp-bridge.xml.in b/op-mode-definitions/vpp-bridge.xml.in deleted file mode 100644 index 70aaa0418..000000000 --- a/op-mode-definitions/vpp-bridge.xml.in +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="vpp"> - <children> - <node name="bridge"> - <properties> - <help>Show VPP bridge information</help> - </properties> - <command>${vyos_op_scripts_dir}/vpp.py show_bridge</command> - <children> - <virtualTagNode> - <properties> - <help>Show bridge information for specified interface</help> - <completionHelp> - <path>interfaces vpp bridge</path> - </completionHelp> - </properties> - <command>${vyos_op_scripts_dir}/vpp.py show_bridge --ifname=$4</command> - <children> - <leafNode name="detail"> - <properties> - <help>Show detailed bridge domain information</help> - </properties> - <command>${vyos_op_scripts_dir}/vpp.py show_bridge_details --ifname=$4</command> - </leafNode> - </children> - </virtualTagNode> - </children> - </node> - </children> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/vpp_lacp.xml.in b/op-mode-definitions/vpp_lacp.xml.in deleted file mode 100644 index 60d18647f..000000000 --- a/op-mode-definitions/vpp_lacp.xml.in +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="vpp"> - <children> - <node name="lacp"> - <properties> - <help>Show VPP LACP information</help> - </properties> - <command>${vyos_op_scripts_dir}/vpp.py show_lacp</command> - <children> - <virtualTagNode> - <properties> - <help>Show specific interface LACP information</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces --bondable</script> - </completionHelp> - </properties> - <command>${vyos_op_scripts_dir}/vpp.py show_lacp --ifname=$4</command> - <children> - <leafNode name="detail"> - <properties> - <help>Show interface LACP details</help> - </properties> - <command>${vyos_op_scripts_dir}/vpp.py show_lacp_details --ifname=$4</command> - </leafNode> - </children> - </virtualTagNode> - <leafNode name="detail"> - <properties> - <help>Show LACP detailed information</help> - </properties> - <command>${vyos_op_scripts_dir}/vpp.py show_lacp_details</command> - </leafNode> - </children> - </node> - </children> - </node> - </children> - </node> -</interfaceDefinition>
\ No newline at end of file |