Set log level of login to info

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

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 0ddcdab5d4205c32056f454213b0f6d711ce0f96..c49c0f395d21b16e132ffe2cfe9199e370cb7712 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -1,29 +1,34 @@
 #!/usr/bin/python3
 
-
+import configparser
 import libvirt
-
+import logging
 import os
+import time
 
-import configparser
+from . import recipe
+from . import virtual_environ
 
-from nitsi.virtual_environ import virtual_environ
-from nitsi.recipe import recipe
+logger = logging.getLogger("nitsi.test")
 
-import logging
 
-logger = logging.getLogger("nitsi.test")
+class TestException(Exception):
+    def __init__(self, message):
+        self.message = message
 
 class test():
-    def __init__(self, path):
+    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
 
         self.log.debug("Path of this test is: {}".format(self.path))
 
+        self.log_path = log_path
+
         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))
@@ -54,7 +59,7 @@ class test():
         self.virtual_environ_path = os.path.normpath(self.path + "/" + self.virtual_environ_path)
 
     def virtual_environ_setup(self):
-        self.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()
 
@@ -71,15 +76,23 @@ class test():
             self.virtual_machines[name].copy_in(self.copy_from, self.copy_to)
             self.virtual_machines[name].start()
 
-        self.log.debug("Try to login on all machines")
+        # Time to which all serial output log entries are relativ
+        log_start_time = time.time()
+
+        # 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.debug("Try to login on {}".format(name))
-            self.virtual_machines[name].login()
+            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)
 
     def load_recipe(self):
         self.log.info("Going to load the recipe")
         try:
-            self.recipe = recipe(self.recipe_file)
+            self.recipe = recipe.recipe(self.recipe_file)
             for line in self.recipe.recipe:
                 self.log.debug(line)
 
@@ -93,22 +106,26 @@ class test():
             return_value = self.virtual_machines[line[0]].cmd(line[2])
             self.log.debug("Return value is: {}".format(return_value))
             if return_value != "0" and line[1] == "":
-                self.log.error("Failed to execute command '{}' on {}, return code: {}".format(line[2],line[0], return_value))
-                return False
+                raise TestException("Failed to execute command '{}' on {}, return code: {}".format(line[2],line[0], return_value))
             elif return_value == "0" and line[1] == "!":
-                self.log.error("Succeded to execute command '{}' on {}, return code: {}".format(line[2],line[0],return_value))
-                return False
+                raise TestException("Succeded to execute command '{}' on {}, return code: {}".format(line[2],line[0],return_value))
             else:
                 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:
-            self.virtual_machines[name].shutdown()
-            self.virtual_machines[name].revert_snapshot()
-            self.virtual_machines[name].undefine()
+            # We just catch exception here to avoid
+            # that we stop the cleanup process if only  one command fails
+            try:
+                self.virtual_machines[name].shutdown()
+                self.virtual_machines[name].revert_snapshot()
+                self.virtual_machines[name].undefine()
+            except BaseException as e:
+                self.log.exception(e)
 
         for name in self.virtual_environ.network_names:
-            self.virtual_networks[name].undefine()
-
-
+            try:
+                self.virtual_networks[name].undefine()
+            except BaseException as e:
+                 self.log.exception(e)