Make sure that cleanup phase happens before any slave configuration,
so the configuration doesn't get wiped out by accident.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
---
lnst/Controller/NetTestController.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index b0ffd90..14c706f 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -246,6 +246,9 @@ class NetTestController:
self._rpc_call(machine_id, "clear_resource_table")
required = self._resource_table
+ if self._docleanup:
+ self._rpc_call(machine_id, 'machine_cleanup')
+
for res_type, resources in self._resource_table.iteritems():
for res_name, res in resources.iteritems():
has_resource = self._rpc_call(machine_id, "has_resource",
@@ -285,9 +288,6 @@ class NetTestController:
for device in provisioner["netdevices"].itervalues():
self._rpc_call(machine_id, 'set_device_down',
device["hwaddr"])
- if self._docleanup:
- self._rpc_call(machine_id, 'machine_cleanup')
-
def _init_slave_rpc(self, machine_id):
info = self._get_machineinfo(machine_id)
hostname = info["hostname"]
--
1.7.7.6
Show replies by thread