Make config parsing more robust against errors

[nitsi.git] / src / nitsi / test.py

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index c46d7df680e8f8819c5c80322b4b38b89433fc7c..8d29e3047cb57209580d62325b51b6b1376ba319 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -16,7 +16,7 @@ class TestException(Exception):
     def __init__(self, message):
         self.message = message
 
-class test():
+class Test():
     def __init__(self, path, log_path):
         try:
             self.path = os.path.abspath(path)
@@ -32,34 +32,54 @@ class test():
         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")
 
         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))
+            raise TestException("No recipe file found")
 
     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"]
+        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
+
+        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)
+
+        # Parse copy_from setting
         self.copy_from = self.copy_from.split(",")
 
         tmp = []
         for file in self.copy_from:
             file = file.strip()
-            file = os.path.normpath(self.path + "/" + file)
-            tmp.append(file)
+            # 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 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))
+
+                self.log.debug("'{}' will be copied into all images".format(file))
+                tmp.append(file)
 
         self.copy_from = tmp
 
-        self.virtual_environ_name = self.config["VIRTUAL_ENVIRONMENT"]["Name"]
-        self.virtual_environ_path = self.config["VIRTUAL_ENVIRONMENT"]["Path"]
-        self.virtual_environ_path = os.path.normpath(self.path + "/" + self.virtual_environ_path)
+
 
     def virtual_environ_setup(self):
-        self.virtual_environ = virtual_environ.virtual_environ(self.virtual_environ_path)
+        self.virtual_environ = virtual_environ.Virtual_environ(self.virtual_environ_path)
 
         self.virtual_networks = self.virtual_environ.get_networks()
 
@@ -82,9 +102,9 @@ class test():
         # Number of chars of the longest machine name
         longest_machine_name = self.virtual_environ.longest_machine_name
 
-        self.log.debug("Try to login on all machines")
+        self.log.info("Try to login on all machines")
         for name in self.virtual_environ.machine_names:
-            self.log.debug("Try to login on {}".format(name))
+            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,
                                                 longest_machine_name=longest_machine_name)
@@ -92,7 +112,7 @@ class test():
     def load_recipe(self):
         self.log.info("Going to load the recipe")
         try:
-            self.recipe = recipe.recipe(self.recipe_file)
+            self.recipe = recipe.Recipe(self.recipe_file, machines=self.virtual_environ.machine_names)
             for line in self.recipe.recipe:
                 self.log.debug(line)