]> git.ipfire.org Git - nitsi.git/blobdiff - src/nitsi/test.py
Rework the connection handling of the serial console
[nitsi.git] / src / nitsi / test.py
index 97330c223240327ec0b44363783708811625b3a5..cced43157ea2bb52e58ff5338d898b7b513c5e47 100755 (executable)
@@ -8,6 +8,7 @@ import time
 
 from . import recipe
 from . import virtual_environ
+from . import settings
 
 logger = logging.getLogger("nitsi.test")
 
@@ -17,78 +18,160 @@ class TestException(Exception):
         self.message = message
 
 class Test():
-    def __init__(self, path, log_path):
-        try:
-            self.path = os.path.abspath(path)
-            self.log = logger.getChild(os.path.basename(self.path))
-        except BaseException as e:
-            logger.error("Could not get absolute path")
-            raise e
+    def __init__(self, log_path, dir=None, recipe_file=None, settings_file=None, cmd_settings=None):
+        # init settings var
+        self.settings = {}
+
+        # Set default values for the settings dict
+        self.settings["name"] = ""
+        self.settings["description"] = ""
+        self.settings["copy_from"] = None
+        self.settings["copy_to"] = None
+        self.settings["virtual_environ_path"] = None
+
+        self.cmd_settings = cmd_settings
+        self.log_path = log_path
 
-        self.log.debug("Path of this test is: {}".format(self.path))
+        # Init all vars with None
+        self.settings_file = None
+        self.recipe_file = None
+        self.path = None
 
-        self.log_path = log_path
+        # We need at least a path to a recipe file or a dir to a test
+        if not dir and not recipe:
+            raise TestException("Did not get a path to a test or to a recipe file")
+
+        # We cannot decide which to use when we get both
+        if (dir and recipe_file) or (dir and settings_file):
+            raise TestException("Get dir and path to recipe or settings file")
+
+        if dir:
+            try:
+                if not os.path.isabs(dir):
+                    self.path = os.path.abspath(dir)
+            except BaseException as e:
+                logger.error("Could not get absolute path")
+                raise e
 
-        self.settings_file = "{}/settings".format(self.path)
-        if not os.path.isfile(self.settings_file):
-            self.log.error("No such file: {}".format(self.settings_file))
-            raise TestException("No settings file found")
+            logger.debug("Path of this test is: {}".format(self.path))
 
-        self.recipe_file = "{}/recipe".format(self.path)
-        if not os.path.isfile(self.recipe_file):
-            self.log.error("No such file: {}".format(self.recipe_file))
+            self.recipe_file = "{}/recipe".format(self.path)
+            self.settings_file = "{}/settings".format(self.path)
+
+        if recipe_file:
+            if not os.path.isabs(recipe_file):
+                self.recipe_file = os.path.abspath(recipe_file)
+            else:
+                self.recipe_file = recipe_file
+
+        if settings_file:
+            if not os.path.isabs(settings_file):
+                self.settings_file = os.path.abspath(settings_file)
+            else:
+                self.settings_file = settings_file
+
+        # We can also go on without a settings file
+        if self.settings_file:
+            if not os.path.isfile(self.settings_file):
+                logger.error("No such file: {}".format(self.settings_file))
+                raise TestException("No settings file found")
+
+        # os.path.isfile fails if self.recipe_file is None so we cannot use an and statement
+        if self.recipe_file:
+            if not os.path.isfile(self.recipe_file):
+                logger.error("No such file: {}".format(self.recipe_file))
+                raise TestException("No recipe file found")
+        else:
+            logger.error("No such file: {}".format(self.recipe_file))
             raise TestException("No recipe file found")
 
+
+        # Init logging
+        if dir:
+             self.log = logger.getChild(os.path.basename(self.path))
+
+        if recipe:
+            self.log = logger.getChild(os.path.basename(self.recipe_file))
+
     def read_settings(self):
-        self.config = configparser.ConfigParser()
-        self.config.read(self.settings_file)
-        self.name = self.config["DEFAULT"]["name"]
-        self.description = self.config["DEFAULT"]["description"]
-        self.copy_to = self.config["DEFAULT"]["copy_to"]
-        self.copy_from = self.config["DEFAULT"]["copy_from"]
-        self.virtual_environ_path = self.config["VIRTUAL_ENVIRONMENT"]["path"]
-        self.virtual_environ_path = os.path.normpath(self.path + "/" + self.virtual_environ_path)
+        if self.settings_file:
+            self.log.debug("Going to read all settings from the ini file")
+            try:
+                self.config = configparser.ConfigParser()
+                self.config.read(self.settings_file)
+            except BaseException as e:
+                self.log.error("Failed to parse the config")
+                raise e
 
-        # Parse copy_from setting
-        self.copy_from = self.copy_from.split(",")
+            self.settings["name"] = self.config.get("GENERAL","name", fallback="")
+            self.settings["description"] = self.config.get("GENERAL", "description",  fallback="")
+            self.settings["copy_to"] = self.config.get("GENERAL", "copy_to", fallback=None)
+            self.settings["copy_from"] = self.config.get("GENERAL", "copy_from", fallback=None)
+            self.settings["virtual_environ_path"] = self.config.get("VIRTUAL_ENVIRONMENT", "path", fallback=None)
 
-        tmp = []
-        for file in self.copy_from:
-            file = file.strip()
-            # If file is empty we do not want to add it to the list
-            if not file == "":
-                # If we get an absolut path we do nothing
-                # If not we add self.path to get an absolut path
-                if not os.path.isabs(file):
-                    file = os.path.normpath(self.path + "/" + file)
+            # We need to parse some settings here because they are loaded from a settings file
+            if not os.path.isabs(self.settings["virtual_environ_path"]):
+                self.settings["virtual_environ_path"] = os.path.normpath(os.path.dirname(
+                    self.settings_file) + "/" + self.settings["virtual_environ_path"])
 
-                # We need to check if file is a valid file or dir
-                if not (os.path.isdir(file) or os.path.isfile(file)):
-                    raise TestException("'{}' is not a valid file nor a valid directory".format(file))
+            # Parse copy_from setting
+            if self.settings["copy_from"]:
+                self.settings["copy_from"] = settings.settings_parse_copy_from(self.settings["copy_from"],
+                path=os.path.dirname(self.settings_file))
 
-                self.log.debug("'{}' will be copied into all images".format(file))
-                tmp.append(file)
+        # Update all settings from the cmd
+        self.settings.update(self.cmd_settings)
 
-        self.copy_from = tmp
+        if not os.path.isabs(self.settings["virtual_environ_path"]):
+            self.settings["virtual_environ_path"] = os.path.abspath(self.settings["virtual_environ_path"])
 
 
+        # Check if we get at least a valid a valid path to virtual environ
+        if not self.settings["virtual_environ_path"]:
+            self.log.error("No path for virtual environment found.")
+            raise TestException("No path for virtual environment found.")
 
-    def virtual_environ_setup(self):
-        self.virtual_environ = virtual_environ.Virtual_environ(self.virtual_environ_path)
+        # Print all settings for debugging purpose
+        self.log.debug("Settings are:")
+        for key in self.settings:
+            self.log.debug("{}: {}".format(key, self.settings[key]))
+
+
+    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 = []
+
+        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()
 
-        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()
-            self.virtual_machines[name].copy_in(self.copy_from, self.copy_to)
+            # We can only copy files when we know which and to which dir
+            if self.settings["copy_from"] and self.settings["copy_to"]:
+                self.virtual_machines[name].copy_in(self.settings["copy_from"], self.settings["copy_to"])
             self.virtual_machines[name].start()
 
         # Time to which all serial output log entries are relativ
@@ -97,17 +180,20 @@ class Test():
         # Number of chars of the longest machine name
         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:
-            self.log.info("Try to login on {}".format(name))
-            self.virtual_machines[name].login("{}/test.log".format(self.log_path),
+        self.log.info("Try to intialize the serial connection, connect and login on all machines")
+        for name in self.used_machine_names:
+            self.log.info("Try to initialize the serial connection connect and login on {}".format(name))
+            self.virtual_machines[name].serial_init(log_file="{}/test.log".format(self.log_path),
                                                 log_start_time=log_start_time,
                                                 longest_machine_name=longest_machine_name)
+            self.virtual_machines[name].serial_connect()
 
     def load_recipe(self):
         self.log.info("Going to load the recipe")
         try:
-            self.recipe = recipe.Recipe(self.recipe_file, machines=self.virtual_environ.machine_names)
+            self.recipe = recipe.Recipe(self.recipe_file,
+                fallback_machines=self.virtual_environ.machine_names)
+
             for line in self.recipe.recipe:
                 self.log.debug(line)
 
@@ -128,7 +214,7 @@ class Test():
                 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: