From 84f2c0bf47315f1da7bff185621aa07f3540e440 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 10 Jul 2022 22:31:49 +0200
Subject: bond: T4521: ARP monitor interval is not configured despite set via
 CLI

The code path for changing the interval is never executed.

(cherry picked from commit daddb0ad7812843f64a7ae0bf4b5e15db7b1758e)
---
 python/vyos/ifconfig/bond.py | 57 +++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

(limited to 'python')

diff --git a/python/vyos/ifconfig/bond.py b/python/vyos/ifconfig/bond.py
index 27d0182e9..dbe089801 100644
--- a/python/vyos/ifconfig/bond.py
+++ b/python/vyos/ifconfig/bond.py
@@ -199,16 +199,7 @@ class BondIf(Interface):
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').set_arp_interval('100')
         """
-        if int(interval) == 0:
-            """
-            Specifies the MII link monitoring frequency in milliseconds.
-            This determines how often the link state of each slave is
-            inspected for link failures. A value of zero disables MII
-            link monitoring. A value of 100 is a good starting point.
-            """
-            return self.set_interface('bond_miimon', interval)
-        else:
-            return self.set_interface('bond_arp_interval', interval)
+        return self.set_interface('bond_arp_interval', interval)
 
     def get_arp_ip_target(self):
         """
@@ -365,26 +356,6 @@ class BondIf(Interface):
         if 'shutdown_required' in config:
             self.set_admin_state('down')
 
-        # ARP monitor targets need to be synchronized between sysfs and CLI.
-        # Unfortunately an address can't be send twice to sysfs as this will
-        # result in the following exception:  OSError: [Errno 22] Invalid argument.
-        #
-        # We remove ALL addresses prior to adding new ones, this will remove
-        # addresses manually added by the user too - but as we are limited to 16 adresses
-        # from the kernel side this looks valid to me. We won't run into an error
-        # when a user added manual adresses which would result in having more
-        # then 16 adresses in total.
-        arp_tgt_addr = list(map(str, self.get_arp_ip_target().split()))
-        for addr in arp_tgt_addr:
-            self.set_arp_ip_target('-' + addr)
-
-        # Add configured ARP target addresses
-        value = dict_search('arp_monitor.target', config)
-        if isinstance(value, str):
-            value = [value]
-        if value:
-            for addr in value:
-                self.set_arp_ip_target('+' + addr)
 
         # Bonding transmit hash policy
         value = config.get('hash_policy')
@@ -414,6 +385,32 @@ class BondIf(Interface):
             if mode == '802.3ad':
                 self.set_lacp_rate(config.get('lacp_rate'))
 
+            if mode not in ['802.3ad', 'balance-tlb', 'balance-alb']:
+                tmp = dict_search('arp_monitor.interval', config)
+                value = tmp if (tmp != None) else '0'
+                self.set_arp_interval(value)
+
+                # ARP monitor targets need to be synchronized between sysfs and CLI.
+                # Unfortunately an address can't be send twice to sysfs as this will
+                # result in the following exception:  OSError: [Errno 22] Invalid argument.
+                #
+                # We remove ALL addresses prior to adding new ones, this will remove
+                # addresses manually added by the user too - but as we are limited to 16 adresses
+                # from the kernel side this looks valid to me. We won't run into an error
+                # when a user added manual adresses which would result in having more
+                # then 16 adresses in total.
+                arp_tgt_addr = list(map(str, self.get_arp_ip_target().split()))
+                for addr in arp_tgt_addr:
+                    self.set_arp_ip_target('-' + addr)
+
+                # Add configured ARP target addresses
+                value = dict_search('arp_monitor.target', config)
+                if isinstance(value, str):
+                    value = [value]
+                if value:
+                    for addr in value:
+                        self.set_arp_ip_target('+' + addr)
+
             # Add (enslave) interfaces to bond
             value = dict_search('member.interface', config)
             for interface in (value or []):
-- 
cgit v1.2.3