Split setup virtual environment in two functions

We need the list of virtual machines in the virtual environment to parse
the recipe, but we can create the list of used machines only when we
have a recipe. So we need to split these function.

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

diff --git a/nitsi.in b/nitsi.in
index c9d3d0f4ece66f8e6d8e9e4ca32165b4dc4b9c61..12bff89d654dcfb3c3c548ae4ca2f3c21a90b2f7 100755 (executable)
--- a/nitsi.in
+++ b/nitsi.in
@@ -101,8 +101,9 @@ def main():
                 settings_file=args.settings,
                 cmd_settings=settings)
             currenttest.read_settings()
+            currenttest.virtual_environ_setup_stage_1()
             currenttest.load_recipe()
-            currenttest.virtual_environ_setup()
+            currenttest.virtual_environ_setup_stage_2()
         except RecipeExeption as e:
             logger.exception(e)
             return 2

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 51c6402ea0a9a1d764ebc71cd5350cba77710e6f..7d17cec05d680d5bb64da37c03359de2608797fe 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -137,13 +137,14 @@ class Test():
             self.log.debug("{}: {}".format(key, self.settings[key]))
 
 
-    def virtual_environ_setup(self):
+    def virtual_environ_setup_stage_1(self):
         self.virtual_environ = virtual_environ.VirtualEnviron(self.settings["virtual_environ_path"])
 
         self.virtual_networks = self.virtual_environ.get_networks()
 
         self.virtual_machines = self.virtual_environ.get_machines()
 
+    def virtual_environ_setup_stage_2(self):
         # built up which machines which are used in our recipe
         used_machines = []