From 3dac98813960083e7f79093de911582093efe2cb Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 28 Jul 2018 11:44:54 +0200 Subject: [PATCH] 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 --- nitsi.in | 3 ++- src/nitsi/test.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nitsi.in b/nitsi.in index c9d3d0f..12bff89 100755 --- 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 51c6402..7d17cec 100755 --- 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 = [] -- 2.39.2