From: Ondrej Lichtner olichtne@redhat.com
Since restore_system_config is often tied to interfaces it should happen before the interfaces are deconfigured and removed. This bug was revealed through the newly added IntefaceAPI method set_mtu.
Fixes #121
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- lnst/Controller/Machine.py | 2 ++ lnst/Slave/NetTestSlave.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py index a0e786c..c360e6c 100644 --- a/lnst/Controller/Machine.py +++ b/lnst/Controller/Machine.py @@ -226,6 +226,8 @@ class Machine(object): for netns in self._namespaces: self._rpc_call_to_netns(netns, "kill_cmds")
+ self.restore_system_config() + if deconfigure: ordered_ifaces.reverse() for iface in ordered_ifaces: diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py index 34f9652..6f07bbc 100644 --- a/lnst/Slave/NetTestSlave.py +++ b/lnst/Slave/NetTestSlave.py @@ -393,6 +393,8 @@ class SlaveMethods: logging.info("Performing machine cleanup.") self._command_context.cleanup()
+ self.restore_system_config() + devs = self._if_manager.get_mapped_devices() for if_id, dev in devs.iteritems(): peer = dev.get_peer() @@ -411,7 +413,6 @@ class SlaveMethods:
self._if_manager.clear_if_mapping() self._cache.del_old_entries() - self.restore_system_config() self._remove_capture_files() return True