From Dan Kenigsberg <[email protected]>: Dan Kenigsberg has submitted this change and it was merged.
Change subject: net: Modify restore-net to remove nets using setupNetworks ...................................................................... net: Modify restore-net to remove nets using setupNetworks Overview: The network restoration flow has a step in which acquired devices which have been 'taken' by VDSM are restored. When a device is acquired by VDSM, it is backed up, allowing later rollback. The backed up data is cleared on setSafe or in case a restoration is performed. Problem: When restoring in this step, an existing network (or partial network) is removed by the underlying ifcfg configurator, but not through the proper API. Therefore, in such a scenario: Clean host -> setupNetworks(add A) -> restore-net (note that setSate() is missing) Network A will be removed using ifcfg backup restoration flow without issuing a setupNetworks(remove A). One outcome of the missing proper removal of the network is that its leftovers remain in the libvirt db. This patch changes the restore flow such that it first removes extra networks/bonds (which do not appear in the persisted config, but do appear on the host) and only then attempts to restore the acquired devices. Change-Id: I387d5e3fd9be74e2789904ca8eaf9d867c9d4c3d Signed-off-by: Edward Haas <[email protected]> --- M tests/functional/networkTests.py M vdsm/vdsm-restore-net-config 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/72324 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I387d5e3fd9be74e2789904ca8eaf9d867c9d4c3d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <[email protected]> Gerrit-Reviewer: Dan Kenigsberg <[email protected]> Gerrit-Reviewer: Edward Haas <[email protected]> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček <[email protected]> Gerrit-Reviewer: gerrit-hooks <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
