openstack
/
os-net-config
Code Issues Proposed changes

Merge "Run ifup on a bond when a slave interface is restarted"

This commit is contained in:
Zuul 2020-04-08 14:08:20 +00:00 committed by Gerrit Code Review
parent 78c7b1317d fe13c4944b
commit 733adbf5c9
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os_net_config/impl_ifcfg.py
View File

@ -1228,6 +1228,7 @@ class IfcfgNetConfig(os_net_config.NetConfig):
restart_ib_childs = []
restart_bridges = []
restart_linux_bonds = []
start_linux_bonds = []
restart_linux_teams = []
restart_vpp = False
apply_interfaces = []
@ -1236,6 +1237,7 @@ class IfcfgNetConfig(os_net_config.NetConfig):
apply_rules = []
update_files = {}
all_file_names = []
linux_bond_children = {}
ivs_uplinks = [] # ivs physical uplinks
ivs_interfaces = [] # ivs internal ports
nfvswitch_interfaces = [] # nfvswitch physical interfaces
@ -1491,11 +1493,12 @@ class IfcfgNetConfig(os_net_config.NetConfig):
all_file_names.append(bond_route_path)
all_file_names.append(bond_route6_path)
all_file_names.append(bond_rule_path)
children = self.child_members(bond_name)
linux_bond_children[bond_name] = children
if utils.diff(bond_path, bond_data):
if self.ifcfg_requires_restart(bond_path, bond_data):
restart_linux_bonds.append(bond_name)
# Avoid duplicate interface being added to the restart list
children = self.child_members(bond_name)
for child in children:
if child not in restart_interfaces:
restart_interfaces.append(child)
@ -1750,6 +1753,10 @@ class IfcfgNetConfig(os_net_config.NetConfig):
for interface in restart_interfaces:
self.ifdown(interface)
for bond in linux_bond_children:
if interface in linux_bond_children[bond]:
if bond not in restart_linux_bonds:
start_linux_bonds.append(bond)
for linux_bond in restart_linux_bonds:
self.ifdown(linux_bond)
@ -1820,6 +1827,10 @@ class IfcfgNetConfig(os_net_config.NetConfig):
for interface in restart_interfaces:
self.ifup(interface)
for linux_bond in start_linux_bonds:
if linux_bond not in restart_linux_bonds:
restart_linux_bonds.append(linux_bond)
for linux_bond in restart_linux_bonds:
self.ifup(linux_bond)

34
os_net_config/tests/test_impl_ifcfg.py
View File

@ -2364,14 +2364,46 @@ class TestIfcfgNetConfigApply(base.TestCase):
self.assertIn('em2', self.ifup_interface_names)
self.assertIn('vlan10', self.ifup_interface_names)
def test_linux_bond_ifup_on_child_restart(self):
# if a bond slave is restarted then ifup should be called on the bond
self.ifup_interface_names = []
interface1 = objects.Interface('em1')
bond = objects.LinuxBond('bond0', members=[interface1])
self.provider.add_linux_bond(bond)
self.provider.add_interface(interface1)
self.provider.apply()
self.assertIn('em1', self.ifup_interface_names)
self.assertIn('bond0', self.ifup_interface_names)
self.ifup_interface_names = []
# changing mtu should not require a restart of em1 (or the bond)
interface1.mtu = 9000
self.provider.linuxbond_data = {}
self.provider.interface_data = {}
self.provider.add_linux_bond(bond)
self.provider.add_interface(interface1)
self.provider.apply()
self.assertNotIn('em1', self.ifup_interface_names)
self.assertNotIn('bond0', self.ifup_interface_names)
# changing nm_controlled should require a restart of em1 (and the bond)
interface1.nm_controlled = True
self.provider.add_interface(interface1)
self.provider.apply()
self.assertIn('em1', self.ifup_interface_names)
self.assertIn('bond0', self.ifup_interface_names)
def test_restart_interface_counts(self):
interface = objects.Interface('em1')
self.provider.add_interface(interface)
interface2 = objects.Interface('em2')
bond = objects.LinuxBond('bond0', members=[interface, interface2])
self.provider.add_bond(bond)
self.provider.add_interface(interface)
self.provider.add_interface(interface2)
self.provider.apply()
self.assertEqual(1, self.ifup_interface_names.count("em1"))
self.assertEqual(1, self.ifup_interface_names.count("em2"))
self.assertEqual(1, self.ifup_interface_names.count("bond0"))
def test_vlan_apply(self):
vlan = objects.Vlan('em1', 5)