Start only the machines which are used in the recipe

We now parse the recipe first and setup the virtual environment after this
to start only the machines we really need. This safes time and
ressources.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/nitsi.in b/nitsi.in
index 657504cbb4757a0370305300049d70daf6f1be6a..c9d3d0f4ece66f8e6d8e9e4ca32165b4dc4b9c61 100755 (executable)
--- a/nitsi.in
+++ b/nitsi.in
@@ -101,8 +101,8 @@ def main():
                 settings_file=args.settings,
                 cmd_settings=settings)
             currenttest.read_settings()
                 settings_file=args.settings,
                 cmd_settings=settings)
             currenttest.read_settings()

-            currenttest.virtual_environ_setup()

             currenttest.load_recipe()
             currenttest.load_recipe()

+            currenttest.virtual_environ_setup()

         except RecipeExeption as e:
             logger.exception(e)
             return 2
         except RecipeExeption as e:
             logger.exception(e)
             return 2

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 5ea928fab4fe36308ad5f3cf6efada725a4b9bc9..51c6402ea0a9a1d764ebc71cd5350cba77710e6f 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -144,12 +144,28 @@ class Test():
 
         self.virtual_machines = self.virtual_environ.get_machines()
 
 
         self.virtual_machines = self.virtual_environ.get_machines()
 

+        # built up which machines which are used in our recipe
+        used_machines = []
+
+        for line in self.recipe.recipe:
+            if not line[0] in used_machines:
+                used_machines.append(line[0])
+
+        self.log.debug("Machines used in this recipe {}".format(used_machines))
+
+        self.used_machine_names = used_machines
+
+        for machine in self.used_machine_names:
+            if not machine in self.virtual_environ.machine_names:
+                raise TestException("{} is listed as machine in the recipe, but the virtual environmet does not have such a machine".format(machine))
+
+

     def virtual_environ_start(self):
         for name in self.virtual_environ.network_names:
             self.virtual_networks[name].define()
             self.virtual_networks[name].start()
 
     def virtual_environ_start(self):
         for name in self.virtual_environ.network_names:
             self.virtual_networks[name].define()
             self.virtual_networks[name].start()
 

-        for name in self.virtual_environ.machine_names:
+        for name in self.used_machine_names:

             self.virtual_machines[name].define()
             self.virtual_machines[name].create_snapshot()
             # We can only copy files when we know which and to which dir
             self.virtual_machines[name].define()
             self.virtual_machines[name].create_snapshot()
             # We can only copy files when we know which and to which dir


@@ -164,7 +180,7 @@ class Test():
         longest_machine_name = self.virtual_environ.longest_machine_name
 
         self.log.info("Try to login on all machines")
         longest_machine_name = self.virtual_environ.longest_machine_name
 
         self.log.info("Try to login on all machines")

-        for name in self.virtual_environ.machine_names:
+        for name in self.used_machine_names:

             self.log.info("Try to login on {}".format(name))
             self.virtual_machines[name].login("{}/test.log".format(self.log_path),
                                                 log_start_time=log_start_time,
             self.log.info("Try to login on {}".format(name))
             self.virtual_machines[name].login("{}/test.log".format(self.log_path),
                                                 log_start_time=log_start_time,


@@ -194,7 +210,7 @@ class Test():
                 self.log.debug("Command '{}' on {} returned with: {}".format(line[2],line[0],return_value))
 
     def virtual_environ_stop(self):
                 self.log.debug("Command '{}' on {} returned with: {}".format(line[2],line[0],return_value))
 
     def virtual_environ_stop(self):

-        for name in self.virtual_environ.machine_names:
+        for name in self.used_machine_names:

             # We just catch exception here to avoid
             # that we stop the cleanup process if only  one command fails
             try:
             # We just catch exception here to avoid
             # that we stop the cleanup process if only  one command fails
             try: