From 3b5395580f4134a3295fbf8f8ebcc4b3caa38673 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 2 Nov 2019 04:55:48 +0100
Subject: bridge: T1783: bugfix removal of member interface

Fix error when deleting a member with:
  delete interfaces bridge br0 member interface eth1

  Traceback (most recent call last):
    File "/usr/libexec/vyos/conf_mode/interfaces-bridge.py", line 304, in <module>
      apply(c)
    File "/usr/libexec/vyos/conf_mode/interfaces-bridge.py", line 267, in apply
      br.del_port( intf['name'] )
  TypeError: string indices must be integers
---
 src/conf_mode/interfaces-bridge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 70bf4f528..d152384f7 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -264,7 +264,7 @@ def apply(bridge):
 
         # remove interface from bridge
         for intf in bridge['member_remove']:
-            br.del_port( intf['name'] )
+            br.del_port(intf)
 
         # add interfaces to bridge
         for member in bridge['member']:
-- 
cgit v1.2.3


From 99c762ebbbb30a638760627bc6d5fd86932951e1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 2 Nov 2019 17:10:54 +0100
Subject: bonding: T1777: change priority to be after ethernet interfaces

On system reboots (mainly) the bond has been created and configured a MAC
address on the physical ports. Later ethernet interfaces have been configured
overwriting the bond MAC address.
---
 interface-definitions/interfaces-bonding.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface-definitions/interfaces-bonding.xml b/interface-definitions/interfaces-bonding.xml
index ba1acfff6..821dd15fa 100644
--- a/interface-definitions/interfaces-bonding.xml
+++ b/interface-definitions/interfaces-bonding.xml
@@ -5,7 +5,7 @@
       <tagNode name="bonding" owner="${vyos_conf_scripts_dir}/interfaces-bonding.py">
         <properties>
           <help>Bonding interface name</help>
-          <priority>315</priority>
+          <priority>320</priority>
           <constraint>
             <regex>bond[0-9]+$</regex>
           </constraint>
-- 
cgit v1.2.3