[PATCH 2/3] NetTestController: Cleanup if prepare fails

[Ondrej Lichtner]

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

Since machine preparation is done during recipe parsing, exceptions
result in a crash of the application without cleaning up the partial
changes.
This commit fixes that by calling cleanup functions after an exception
was raised.

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

diff --git a/NetTest/NetTestController.py b/NetTest/NetTestController.py
index 296150d..839d51c 100644
--- a/NetTest/NetTestController.py
+++ b/NetTest/NetTestController.py
@@ -276,7 +276,14 @@ class NetTestController:
     def _prepare(self):
         # All the perparations are made within the recipe parsing
         # This is achieved by handling parser events (by registering
-        self._ntparse.parse_recipe()
+        try:
+            self._ntparse.parse_recipe()
+        except Exception, exc:
+            logging.debug("Exception raised during recipe parsing. "\
+                    "Deconfiguring machines.")
+            self._deconfigure_slaves()
+            self._disconnect_slaves()
+            raise exc
 
     def _run_command(self, command):
         machine_id = command["machine_id"]
-- 
1.7.11.2