From 7c79684a931b6bff3abb0cb8fb75c72cb916f1ce Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 26 Aug 2019 20:54:03 +0200
Subject: bridge: T1556: bugfix: disable node must be valueless

---
 interface-definitions/interfaces-bridge.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'interface-definitions/interfaces-bridge.xml')

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index adb525a46..14887ee02 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -117,6 +117,7 @@
           <leafNode name="disable">
             <properties>
               <help>Disable this bridge interface</help>
+              <valueless/>
             </properties>
           </leafNode>
           <leafNode name="forwarding-delay">
-- 
cgit v1.2.3


From 727ece3b4a9d1d5fced67f0e97fb22e2671eaabc Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 26 Aug 2019 22:28:00 +0200
Subject: bridge: T1556: bugfix: aging range validator

---
 interface-definitions/interfaces-bridge.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'interface-definitions/interfaces-bridge.xml')

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index 14887ee02..e92a55d63 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -57,8 +57,7 @@
                 <description>Address aging time for bridge seconds (default 300)</description>
               </valueHelp>
               <constraint>
-                <validator name="numeric" argument="--range 0-0"/>
-                <validator name="numeric" argument="--range 10-1000000"/>
+                <validator name="numeric" argument="--range 0-0 --range 10-1000000"/>
               </constraint>
             </properties>
           </leafNode>
-- 
cgit v1.2.3


From 3b119c91ca70c51aab24d4ef8b3913f47281321a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 31 Aug 2019 12:43:52 +0200
Subject: bridge: T1556: increase max-age range to 1200 (30 minutes)

---
 interface-definitions/interfaces-bridge.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'interface-definitions/interfaces-bridge.xml')

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index e92a55d63..98998bfa1 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -191,13 +191,13 @@
             <properties>
               <help>Interval at which neighbor bridges are removed</help>
               <valueHelp>
-                <format>1-40</format>
+                <format>1-1200</format>
                 <description>Bridge maximum aging time in seconds (default 20)</description>
               </valueHelp>
               <constraint>
-                <validator name="numeric" argument="--range 1-40"/>
+                <validator name="numeric" argument="--range 1-1200"/>
               </constraint>
-              <constraintErrorMessage>Bridge max aging value must be between 1 and 40 seconds</constraintErrorMessage>
+              <constraintErrorMessage>Bridge max aging value must be between 1 and 1200 seconds</constraintErrorMessage>
             </properties>
           </leafNode>
           <node name="member">
-- 
cgit v1.2.3


From 0ce3b4142a172a092d034a8c1c9e2178340b43d1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 1 Sep 2019 11:08:21 +0200
Subject: bridge: T1556: change 'aging' help text

---
 interface-definitions/interfaces-bridge.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'interface-definitions/interfaces-bridge.xml')

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index 98998bfa1..02d4fa103 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -47,14 +47,14 @@
           </leafNode>
           <leafNode name="aging">
             <properties>
-              <help>Interval addresses are retained</help>
+              <help>MAC address aging interval</help>
               <valueHelp>
                 <format>0</format>
-                <description>Disable retaining address in bridge (always flood)</description>
+                <description>Disable MAC address learning (always flood)</description>
               </valueHelp>
               <valueHelp>
                 <format>10-1000000</format>
-                <description>Address aging time for bridge seconds (default 300)</description>
+                <description>MAC address aging time in seconds (default: 300)</description>
               </valueHelp>
               <constraint>
                 <validator name="numeric" argument="--range 0-0 --range 10-1000000"/>
-- 
cgit v1.2.3


From 5ffa30bcc98be1af1d96b076acb0d8ff44fcb588 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 1 Sep 2019 11:48:36 +0200
Subject: Revert "bridge: T1556: increase max-age range to 1200 (30 minutes)"

This reverts commit 3b119c91ca70c51aab24d4ef8b3913f47281321a.
---
 interface-definitions/interfaces-bridge.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'interface-definitions/interfaces-bridge.xml')

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index 02d4fa103..98633382c 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -191,13 +191,13 @@
             <properties>
               <help>Interval at which neighbor bridges are removed</help>
               <valueHelp>
-                <format>1-1200</format>
+                <format>1-40</format>
                 <description>Bridge maximum aging time in seconds (default 20)</description>
               </valueHelp>
               <constraint>
-                <validator name="numeric" argument="--range 1-1200"/>
+                <validator name="numeric" argument="--range 1-40"/>
               </constraint>
-              <constraintErrorMessage>Bridge max aging value must be between 1 and 1200 seconds</constraintErrorMessage>
+              <constraintErrorMessage>Bridge max aging value must be between 1 and 40 seconds</constraintErrorMessage>
             </properties>
           </leafNode>
           <node name="member">
-- 
cgit v1.2.3


From 4615feb0f7b192afc0c9a1b11628877c5f430180 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 5 Sep 2019 18:25:07 +0200
Subject: bridge: T1556: make ARP cache constraint error message more generic

---
 interface-definitions/interfaces-bridge.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions/interfaces-bridge.xml')

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index 98633382c..4b82972dc 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -170,7 +170,7 @@
                   <constraint>
                     <validator name="numeric" argument="--range 1-86400"/>
                   </constraint>
-                  <constraintErrorMessage>Bridge max aging value must be between 6 and 86400 seconds</constraintErrorMessage>
+                  <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
                 </properties>
               </leafNode>
             </children>
-- 
cgit v1.2.3