From 5b836709a15e4f6a8775e5dc26609febd5bc2480 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 2 Aug 2019 17:27:25 +0200
Subject: [bridge] T1156: support adding and removing bridge member interfaces

This is the new syntax

 bridge br0 {
     member {
         interface eth0 {
             cost 10
         }
         interface eth1 {
             cost 11
         }
     }
 }
---
 interface-definitions/interfaces-bridge.xml | 76 ++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 29 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index a5f2df5b5..af19d9438 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -51,7 +51,8 @@
                 <description>Address aging time for bridge seconds (default 300)</description>
               </valueHelp>
               <constraint>
-                <validator name="numeric" argument="--range 0-1000000"/>
+                <validator name="numeric" argument="--range 0-0"/>
+                <validator name="numeric" argument="--range 10-1000000"/>
               </constraint>
             </properties>
           </leafNode>
@@ -146,20 +147,7 @@
               <leafNode name="querier">
                 <properties>
                   <help>Enable or disable IGMP querier</help>
-                  <completionHelp>
-                    <list>enable disable</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>enable</format>
-                    <description>Enable IGMP querier</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>disable</format>
-                    <description>Disable IGMP querier</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>(enable|disable)</regex>
-                  </constraint>
+                  <valueless/>
                 </properties>
               </leafNode>
             </children>
@@ -206,6 +194,49 @@
               <constraintErrorMessage>Bridge max aging value must be between 1 and 40 seconds</constraintErrorMessage>
             </properties>
           </leafNode>
+          <node name="member">
+            <properties>
+              <help>Bridge member interfaces</help>
+            </properties>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Member interface name</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py --bridgeable</script>
+                  </completionHelp>
+                </properties>
+                <children>
+                  <leafNode name="cost">
+                    <properties>
+                      <help>Bridge port cost</help>
+                      <valueHelp>
+                        <format>1-65535</format>
+                        <description>Path cost value for Spanning Tree Protocol</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-65535"/>
+                      </constraint>
+                      <constraintErrorMessage>Path cost value must be between 1 and 65535</constraintErrorMessage>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="priority">
+                    <properties>
+                      <help>Bridge port priority</help>
+                      <valueHelp>
+                        <format>0-63</format>
+                        <description>Bridge port priority</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-63"/>
+                      </constraint>
+                      <constraintErrorMessage>Port priority value must be between 0 and 63</constraintErrorMessage>
+                    </properties>
+                  </leafNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
           <leafNode name="priority">
             <properties>
               <help>Priority for this bridge</help>
@@ -222,20 +253,7 @@
           <leafNode name="stp">
             <properties>
               <help>Enable spanning tree protocol</help>
-              <completionHelp>
-                <list>true false</list>
-              </completionHelp>
-              <valueHelp>
-                <format>true</format>
-                <description>Enable Spanning Tree Protocol</description>
-              </valueHelp>
-              <valueHelp>
-                <format>false</format>
-                <description>Disable Spanning Tree Protocol</description>
-              </valueHelp>
-              <constraint>
-                <regex>(true|false)</regex>
-              </constraint>
+              <valueless/>
             </properties>
           </leafNode>
         </children>
-- 
cgit v1.2.3