Merge pull request #9 from ypconfig/fix-bond-mode

Fix bond mode

ypconfig/config.py

@@ -207,11 +207,11 @@ def Interface(iface, iname):
 
         if ret['type'] == 'bond':
             try:
-                ret['bond_mode'] = BondMode(iface['bond-mode'])
+                ret['bond-mode'] = BondMode(iface['bond-mode'])
             except ValueError as e:
                 raise e
             except KeyError:
-                ret['bond_mode'] = 0
+                ret['bond-mode'] = 0
 
             try:
                 if iface['miimon']:
@@ -221,7 +221,7 @@ def Interface(iface, iname):
             except KeyError:
                 ret['miimon'] = 100
 
-            if ret['bond_mode'] == '802.3ad':
+            if ret['bond-mode'] == '802.3ad':
                 try:
                     ret['lacp_rate'] = LacpRate(iface['lacp_rate'])
                 except ValueError as e:

ypconfig/netlink.py

@@ -70,7 +70,7 @@ def GetNow():
                     bonddata = linfo.get_attr('IFLA_INFO_DATA')
                     this['type'] = 'bond'
                     this['miimon'] = bonddata.get_attr('IFLA_BOND_MIIMON')
-                    this['bond_mode'] = bonddata.get_attr('IFLA_BOND_MODE')
+                    this['bond-mode'] = bonddata.get_attr('IFLA_BOND_MODE')
                     ret[this['name']] = this
             except Exception as e:
                 print(e)
@@ -96,12 +96,20 @@ def Commit(cur, new):
             Delif(iface)
 
         # These interfaces need to be created
+        toadd = list()
         for iface in newif.difference(curif):
             changed = True
-            if new[iface]['type'] == 'vlan':
-                Addvlan(new[iface])
-            elif new[iface]['type'] == 'bond':
+            if new[iface]['type'] == 'bond':
+                toadd.insert(0, iface)
+            elif new[iface]['type'] == 'vlan':
+                toadd.append(iface)
+
+        for iface in toadd:
+            changed = True
+            if new[iface]['type'] == 'bond':
                 Addbond(new[iface])
+            elif new[iface]['type'] == 'vlan':
+                Addvlan(new[iface])
 
         # Processes changes in remaining interfaces
         for iface in newif.intersection(curif):
@@ -158,7 +166,7 @@ def Commit(cur, new):
                             for slave in set(n[v]).difference(set(c[v])):
                                 Addslave(iface, slave)
                             for slave in set(c[v]).difference(set(n[v])):
-                                Removeslave(iface, slave)
+                                Delslave(iface, slave)
                         elif v in ['vlanid', 'parent']:
                             Delif(iface)
                             Addvlan(new[iface])
@@ -211,7 +219,7 @@ def Addbond(vals):
     print("Creating bond interface %s with %s" % (vals['name'], str(vals)))
     global ip
     iface = vals['name']
-    i = ip.create(kind='bond', ifname=iface, bond_mode=vals['bond_mode'], bond_miimon=vals['miimon'], reuse=True)
+    i = ip.create(kind='bond', ifname=iface, bond_mode=vals['bond-mode'], bond_miimon=vals['miimon'], reuse=True)
     for child in vals['slaves']:
         Ifmtu(child, vals['mtu'])
         Addslave(iface, child)
@@ -231,6 +239,7 @@ def Addbond(vals):
 def Addslave(iface, slave):
     print("Adding interface %s as slave on %s" % (slave, iface))
     global ip
+    Ifstate(slave, 'DOWN')
     i = ip.interfaces[iface]
     i.add_port(ip.interfaces[slave])
     ip.commit()
@@ -239,7 +248,7 @@ def Delslave(iface, slave):
     print("Removing interface %s as slave from %s" % (slave, iface))
     global ip
     i = ip.interfaces[iface]
-    i.del_port(ip.interfaces[slave])
+    i.del_port(slave)
     ip.commit()
 
 def Deladdr(iface, addr):
@@ -259,7 +268,6 @@ def Addaddr(iface, addr):
 def Ifstate(iface, state):
     print("Setting state of interface %s to %s" % (iface, state))
     global ip
-    from pprint import pprint
     i = ip.interfaces[iface]
     if i['kind'] == 'vlan':
         p = ip.interfaces[i['link']]