Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  bonding: T1614: do not overwrite interface description with interface name
  [openvpn] T1661 Adding additional check for tls_dh if it not need for ovpn client
  [openvpn] T1662 Defined default remote port if it not set in cli
  [openvpn] T1661 Fixing returned value on check function
  bonding: T1614: use proper (previously missing) miimon property
  Python/ifconfig: T1557: bonding: add miimon property
  Python/ifconfig: T1557: bonding: fix class name in comments
  bonding: T1660: bugfix for triggered OS permission denied exception
  Revert "[bonding] T1660 Adding additional check. Some bonding mode don't support arp_interval"
  [bonding] T1660 Adding additional check. Some bonding mode don't support arp_interval
  [l2tp] T834 Implementation advanced ppp-options/lcp.
  openvpn: T1548: fix missing sys import
  [l2tp] T834 fix cli reset commands for l2tp and pptp. Adding l2tp%d tunnel naming.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/conf_mode/interface-bonding.py b/src/conf_mode/interface-bonding.py
index dc0363fb7..f0a33beff 100755
--- a/src/conf_mode/interface-bonding.py
+++ b/src/conf_mode/interface-bonding.py
@@ -157,8 +157,6 @@ def get_config():
     # retrieve interface description
     if conf.exists('description'):
         bond['description'] = conf.return_value('description')
-    else:
-        bond['description'] = bond['intf']
 
     # get DHCP client identifier
     if conf.exists('dhcp-options client-id'):
@@ -354,12 +352,12 @@ def apply(bond):
         for intf in b.get_slaves():
             b.del_port(intf)
 
-        # ARP link monitoring frequency
-        b.arp_interval = bond['arp_mon_intvl']
-        # reset miimon on arp-montior deletion
+        # ARP link monitoring frequency, reset miimon when arp-montior is inactive
         if bond['arp_mon_intvl'] == 0:
             # reset miimon to default
-            b.bond_miimon = 250
+            b.miimon = 250
+        else:
+            b.arp_interval = bond['arp_mon_intvl']
 
         # ARP monitor targets need to be synchronized between sysfs and CLI.
         # Unfortunately an address can't be send twice to sysfs as this will