[PATCH] NetTestController: Check tasks before configuration

[Radek Pazdera]

The tasks were checked after all the machines were configured. And in
case there was some trivial error in the task (such as a wrong path),
the whole network configuration was just a plain waste of time.

This commit moves the checks before the configuration is processed.

Issue #36

Signed-off-by: Radek Pazdera 
---
 lnst/Controller/NetTestController.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index fd7692d..bcdd4c1 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -167,9 +167,6 @@ class NetTestController:
     def _prepare_network(self):
         recipe = self._recipe

-        mreq = self._get_machine_requirements()
-        self._prepare_provisioning(mreq)
-
         machines = self._machines
         for m_id in machines.keys():
             self._prepare_machine(m_id)
@@ -179,7 +176,8 @@ class NetTestController:
             for iface_xml_data in machine_xml_data["interfaces"]:
                 self._prepare_interface(m_id, iface_xml_data)

-    def _prepare_provisioning(self, mreq):
+    def _prepare_provisioning(self):
+        mreq = self._get_machine_requirements()
         sp = self._slave_pool
         machines = self._machines
         if not sp.provision_machines(mreq, machines):
@@ -477,13 +475,13 @@ class NetTestController:
             os.remove("/tmp/.lnst_virt_conf")

def match_setup(self):
-        mreq = self._get_machine_requirements()
-        self._prepare_provisioning(mreq)
+        self._prepare_provisioning()

return {"passed": True}

def config_only_recipe(self):
         try:
+            self._prepare_provisioning()
             self._prepare_network()
         except (KeyboardInterrupt, Exception) as exc:
             msg = "Exception raised during configuration."
@@ -500,8 +498,9 @@ class NetTestController:

def run_recipe(self, packet_capture=False):
         try:
-            self._prepare_network()
+            self._prepare_provisioning()
             self._prepare_tasks()
+            self._prepare_network()
         except (KeyboardInterrupt, Exception) as exc:
             msg = "Exception raised during configuration."
             logging.error(msg)