From d32d6d23828b17e3cd4acb9e9a1d41796672c028 Mon Sep 17 00:00:00 2001
From: jack9603301 <jack9603301@163.com>
Date: Sat, 10 Jul 2021 18:31:26 +0800
Subject: bridge: op-mode: T3667: Moving `vlan` to better locations

---
 op-mode-definitions/show-bridge.xml.in | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/op-mode-definitions/show-bridge.xml.in b/op-mode-definitions/show-bridge.xml.in
index 2c792be4a..6a099acb6 100644
--- a/op-mode-definitions/show-bridge.xml.in
+++ b/op-mode-definitions/show-bridge.xml.in
@@ -2,17 +2,24 @@
 <interfaceDefinition>
   <node name="show">
     <children>
-      <leafNode name="bridge">
+      <node name="bridge">
         <properties>
           <help>Show bridging information</help>
         </properties>
-        <command>bridge -c link show</command>
-      </leafNode>
-      <leafNode name="vlan">
+        <children>
+          <leafNode name="vlan">
+            <properties>
+              <help>View the VLAN filter settings of the bridge</help>
+            </properties>
+            <command>bridge -c vlan show</command>
+          </leafNode>
+        </children>
+      </node>
+      <leafNode name="bridge">
         <properties>
-          <help>View the VLAN filter settings of the bridge</help>
+          <help>Show bridging information</help>
         </properties>
-        <command>bridge -c vlan show</command>
+        <command>bridge -c link show</command>
       </leafNode>
       <tagNode name="bridge">
         <properties>
-- 
cgit v1.2.3


From bd2c6d55b5813528d58f8828d18899c30958861b Mon Sep 17 00:00:00 2001
From: jack9603301 <jack9603301@163.com>
Date: Sat, 10 Jul 2021 18:44:42 +0800
Subject: bridge: op-mode: T3667: Fix command line errors

---
 op-mode-definitions/show-bridge.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-mode-definitions/show-bridge.xml.in b/op-mode-definitions/show-bridge.xml.in
index 6a099acb6..268bfaddd 100644
--- a/op-mode-definitions/show-bridge.xml.in
+++ b/op-mode-definitions/show-bridge.xml.in
@@ -34,7 +34,7 @@
             <properties>
               <help>Displays the multicast group database for the bridge</help>
             </properties>
-            <command>bridge -c fdb show dev $3</command>
+            <command>bridge -c mdb show dev $3</command>
           </leafNode>
           <leafNode name="fdb">
             <properties>
-- 
cgit v1.2.3