tsarevvv/nmstate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm.applier: Use modify instead of activate for existing devices

Browse Source 
When editing a device configuration, use nm.modify instead of nm.activate in
order to minimize traffic disruption.

Signed-off-by: Edward Haas <edwardh@redhat.com>
This commit is contained in:
Edward Haas 2019-05-02 09:17:30 +03:00
parent 1c70027b0e
commit 6b7bcaac49
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libnmstate/nm/applier.py
View File

@ -111,17 +111,19 @@ def set_ifaces_admin_state(ifaces_desired_state, con_profiles=()):
- OVS internal.
- All the rest.
"""
con_profiles_by_devname = _index_profiles_by_devname(con_profiles)
new_ifaces = _get_new_ifaces(con_profiles)
new_ifaces_to_activate = set()
new_ovs_interface_to_activate = set()
new_ovs_port_to_activate = set()
master_ifaces_to_activate = set()
master_ifaces_to_edit = set()
ifaces_to_edit = set()
devs_actions = {}
for iface_desired_state in ifaces_desired_state:
nmdev = device.get_device_by_name(iface_desired_state['name'])
ifname = iface_desired_state['name']
nmdev = device.get_device_by_name(ifname)
if not nmdev:
ifname = iface_desired_state['name']
if ifname in new_ifaces and iface_desired_state['state'] == 'up':
if iface_desired_state['type'] == ovs.INTERNAL_INTERFACE_TYPE:
new_ovs_interface_to_activate.add(ifname)
@ -133,9 +135,11 @@ def set_ifaces_admin_state(ifaces_desired_state, con_profiles=()):
if iface_desired_state['state'] == 'up':
master_iface_types = ovs.BRIDGE_TYPE, bond.BOND_TYPE, LB.TYPE
if iface_desired_state['type'] in master_iface_types:
master_ifaces_to_activate.add(nmdev)
master_ifaces_to_edit.add(
(nmdev, con_profiles_by_devname[ifname].profile))
else:
devs_actions[nmdev] = (device.activate,)
ifaces_to_edit.add(
(nmdev, con_profiles_by_devname[ifname].profile))
elif iface_desired_state['state'] in ('down', 'absent'):
nmdevs = _get_affected_devices(iface_desired_state)
for nmdev in nmdevs:
@ -154,8 +158,8 @@ def set_ifaces_admin_state(ifaces_desired_state, con_profiles=()):
for ifname in new_ifaces_to_activate:
device.activate(dev=None, connection_id=ifname)
for dev in master_ifaces_to_activate:
device.activate(dev)
for dev, con_profile in master_ifaces_to_edit:
device.modify(dev, con_profile)
for ifname in new_ovs_port_to_activate:
device.activate(dev=None, connection_id=ifname)
@ -163,11 +167,18 @@ def set_ifaces_admin_state(ifaces_desired_state, con_profiles=()):
for ifname in new_ovs_interface_to_activate:
device.activate(dev=None, connection_id=ifname)
for dev, con_profile in ifaces_to_edit:
device.modify(dev, con_profile)
for dev, actions in six.viewitems(devs_actions):
for action in actions:
action(dev)
def _index_profiles_by_devname(con_profiles):
return {con_profile.devname: con_profile for con_profile in con_profiles}
def _get_new_ifaces(con_profiles):
ifaces_without_device = set()
for con_profile in con_profiles:

23
tests/lib/nm/applier_test.py
View File

@ -192,10 +192,13 @@ class TestIfaceAdminStateControl(object):
'state': 'up',
}
]
nm.applier.set_ifaces_admin_state(ifaces_desired_state)
con_profile = mock.MagicMock()
con_profile.devname = ifaces_desired_state[0]['name']
nm.applier.set_ifaces_admin_state(ifaces_desired_state, [con_profile])
nm_device_mock.activate.assert_called_once_with(
nm_device_mock.get_device_by_name.return_value)
nm_device_mock.modify.assert_called_once_with(
nm_device_mock.get_device_by_name.return_value,
con_profile.profile)
def test_set_ifaces_admin_state_down(self, nm_device_mock):
ifaces_desired_state = [
@ -253,11 +256,17 @@ class TestIfaceAdminStateControl(object):
nm_bond_mock.BOND_TYPE = nm.bond.BOND_TYPE
nm_bond_mock.get_slaves.return_value = slaves
nm.applier.set_ifaces_admin_state(ifaces_desired_state)
bond_con_profile = mock.MagicMock()
bond_con_profile.devname = ifaces_desired_state[0]['name']
slave_con_profile = mock.MagicMock()
slave_con_profile.devname = ifaces_desired_state[1]['name']
nm.applier.set_ifaces_admin_state(
ifaces_desired_state, [bond_con_profile, slave_con_profile])
expected_calls = [
mock.call(bond),
mock.call(slaves[0])
mock.call(bond, bond_con_profile.profile),
mock.call(slaves[0], slave_con_profile.profile)
]
actual_calls = nm_device_mock.activate.mock_calls
actual_calls = nm_device_mock.modify.mock_calls
assert sorted(expected_calls) == sorted(actual_calls)