summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b493676)
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
- def login(self, log_file):
+ def login(self, log_file, log_start_time=None):
- self.serial_con = serial_connection(self.get_serial_device(), username=self.username, log_file=log_file, name=self.name)
+ self.serial_con = serial_connection(self.get_serial_device(),
+ username=self.username,
+ log_file=log_file,
+ log_start_time=log_start_time,
+ name=self.name)
self.serial_con.login(self.password)
except BaseException as e:
self.log.error("Could not connect to the domain via serial console")
self.serial_con.login(self.password)
except BaseException as e:
self.log.error("Could not connect to the domain via serial console")
logger = logging.getLogger("nitsi.serial")
class serial_connection():
logger = logging.getLogger("nitsi.serial")
class serial_connection():
- def __init__(self, device, username=None, log_file=None, name=None):
+ def __init__(self, device, username=None, log_file=None, name=None, log_start_time=None):
self.buffer = b""
self.back_at_prompt_pattern = None
self.username = username
self.buffer = b""
self.back_at_prompt_pattern = None
self.username = username
log_file_handler = logging.FileHandler(self.log_file)
log_file_handler.setLevel(logging.INFO)
log_file_handler.terminator = ""
log_file_handler = logging.FileHandler(self.log_file)
log_file_handler.setLevel(logging.INFO)
log_file_handler.terminator = ""
- formatter = TestFormatter(name=self.name, start_time=None)
+ formatter = TestFormatter(name=self.name, start_time=log_start_time)
log_file_handler.setFormatter(formatter)
self.log_output.addHandler(log_file_handler)
log_file_handler.setFormatter(formatter)
self.log_output.addHandler(log_file_handler)
from nitsi.virtual_environ import virtual_environ
from nitsi.recipe import recipe
from nitsi.virtual_environ import virtual_environ
from nitsi.recipe import recipe
self.virtual_machines[name].copy_in(self.copy_from, self.copy_to)
self.virtual_machines[name].start()
self.virtual_machines[name].copy_in(self.copy_from, self.copy_to)
self.virtual_machines[name].start()
+ # Time to which all serial output log entries are relativ
+ log_start_time = time.time()
+
self.log.debug("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.debug("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("{}/test.log".format(self.log_path))
+ self.virtual_machines[name].login("{}/test.log".format(self.log_path), log_start_time)
def load_recipe(self):
self.log.info("Going to load the recipe")
def load_recipe(self):
self.log.info("Going to load the recipe")