[PATCH 3/3] NetTestController: Partial cleanup support

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Currently cleanup expects that all the machines were configured without
problems. However, this isn't true when an error occured during recipe
parsing.

This commit fixes that by skipping parts that were not configured yet.
It skips machines that don't yet have an rpc connection initialized
because these couldn't have been configured previously.
It also introduces a new list info["created_devices"] which contains all
properly created dynamic devices that need to be removed.

Both of these were added because recipe parsing can fail after creating
data structures for the machine/devices but before actually storing data
in them. This can result in exceptions during cleanup which is again
unwanted behaviour.
I don't know if this is the best solution so if you have a better idea I
am open for discussion.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 NetTest/NetTestController.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/NetTest/NetTestController.py b/NetTest/NetTestController.py
index 839d51c..72233c5 100644
--- a/NetTest/NetTestController.py
+++ b/NetTest/NetTestController.py
@@ -136,6 +136,10 @@ class NetTestController:
                                 % (dev_id, dev["hwaddr"], machine_id)
                 raise NetTestError(msg)
 
+            if 'created_devices' not in info:
+                info['created_devices'] = []
+            info['created_devices'].append((dev_id, dev))
+
         phys_devs = rpc.get_devices_by_hwaddr(dev["hwaddr"])
         if len(phys_devs) == 1:
             pass
@@ -247,18 +251,20 @@ class NetTestController:
     def _deconfigure_slaves(self):
         for machine_id in self._recipe["machines"]:
             info = self._get_machineinfo(machine_id)
+            if "rpc" not in info:
+                continue
             rpc = self._get_machinerpc(machine_id)
             for if_id in reversed(info["configured_interfaces"]):
                 rpc.deconfigure_interface(if_id)
 
             # detach dynamically created devices
-            machine = self._recipe["machines"][machine_id]
-            for dev_id, dev in machine["netdevices"].iteritems():
-                if dev["create"] == "libvirt":
-                    logging.info("Removing netdevice %d (%s) from machine %d",
-                                    dev_id, dev["hwaddr"], machine_id)
-                    domain_ctl = info["virt_domain_ctl"]
-                    domain_ctl.detach_interface(dev["hwaddr"])
+            if "created_devices" not in info:
+                continue
+            for dev_id, dev in reversed(info["created_devices"]):
+                logging.info("Removing netdevice %d (%s) from machine %d",
+                                dev_id, dev["hwaddr"], machine_id)
+                domain_ctl = info["virt_domain_ctl"]
+                domain_ctl.detach_interface(dev["hwaddr"])
 
         # remove dynamically created bridges
         networks = self._recipe["networks"]
-- 
1.7.11.2