Add MASTER=bond SLAVE=yes to linux bond interfaces

When configuring a linux bond with interfaces we have a bug
(due to a missing unit test) where the interfaces weren't
being configured with MASTER=<bond_name> SLAVE=yes. This
patch adds a unit test to check for the required configuration
and cleans up the logic in impl_ifcfg.py to handle it correctly
by simply checking for the linux_bond_name property which
is already set for us via objects.py.

See also: https://bugzilla.redhat.com/show_bug.cgi?id=1323717

Change-Id: Ic632c52265dcbbe6c0ace782e633a2030ad25e6f
Closes-bug: 1566428

2 files changed, 13 insertions, 8 deletions

diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py
index 1142a6e..2172a08 100644
--- a/os_net_config/impl_ifcfg.py
+++ b/os_net_config/impl_ifcfg.py
@@ -65,7 +65,6 @@ class IfcfgNetConfig(os_net_config.NetConfig):
         self.linuxbridge_data = {}
         self.linuxbond_data = {}
         self.member_names = {}
-        self.bond_slaves = {}
         self.renamed_interfaces = {}
         self.bond_primary_ifaces = {}
         logger.info('Ifcfg net config provider created.')
@@ -102,6 +101,9 @@ class IfcfgNetConfig(os_net_config.NetConfig):
             data += "TYPE=IVSIntPort\n"
         elif re.match('\w+\.\d+$', base_opt.name):
             data += "VLAN=yes\n"
+        if base_opt.linux_bond_name:
+            data += "MASTER=%s\n" % base_opt.linux_bond_name
+            data += "SLAVE=yes\n"
         if base_opt.ivs_bridge_name:
             data += "DEVICETYPE=ivs\n"
             data += "IVS_BRIDGE=%s\n" % base_opt.ivs_bridge_name
@@ -171,15 +173,9 @@ class IfcfgNetConfig(os_net_config.NetConfig):
             if base_opt.members:
                 members = [member.name for member in base_opt.members]
                 self.member_names[base_opt.name] = members
-                for member in members:
-                    if isinstance(member, objects.Interface):
-                        self.bond_slaves[member] = base_opt.name
             if base_opt.bonding_options:
                 data += "BONDING_OPTS=\"%s\"\n" % base_opt.bonding_options
         else:
-            if base_opt.name in self.bond_slaves:
-                data += "MASTER=%s\n" % self.bond_slaves[base_opt.name]
-                data += "SLAVE=yes\n"
             if base_opt.use_dhcp:
                 data += "BOOTPROTO=dhcp\n"
             elif not base_opt.addresses:
diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py
index fa85de7..262d0a1 100644
--- a/os_net_config/tests/test_impl_ifcfg.py
+++ b/os_net_config/tests/test_impl_ifcfg.py
@@ -195,7 +195,6 @@ OVSBOOTPROTO=dhcp
 BOND_IFACES="em1 em2"
 """
 
-
 _LINUX_BOND_DHCP = """# This file is autogenerated by os-net-config
 DEVICE=bond0
 ONBOOT=yes
@@ -205,6 +204,12 @@ BOOTPROTO=dhcp
 """
 
 
+_LINUX_BOND_INTERFACE = _BASE_IFCFG + """MASTER=bond0
+SLAVE=yes
+BOOTPROTO=none
+"""
+
+
 _IVS_UPLINK = """# This file is autogenerated by os-net-config
 DEVICE=em1
 ONBOOT=yes
@@ -493,8 +498,12 @@ BOOTPROTO=none
         bond = objects.LinuxBond('bond0', use_dhcp=True,
                                  members=[interface1, interface2])
         self.provider.add_linux_bond(bond)
+        self.provider.add_interface(interface1)
+        self.provider.add_interface(interface2)
         self.assertEqual(_LINUX_BOND_DHCP,
                          self.get_linux_bond_config('bond0'))
+        self.assertEqual(_LINUX_BOND_INTERFACE,
+                         self.get_interface_config('em1'))
 
     def test_interface_defroute(self):
         interface1 = objects.Interface('em1')