#!/usr/bin/python3
-import xml.etree.ElementTree as ET
-
-from nitsi.disk import disk
-
-from nitsi.serial_connection import serial_connection
-
-import os
import libvirt
-
import logging
+import os
+import xml.etree.ElementTree as ET
+
+from . import disk
+from . import serial_connection
logger = logging.getLogger("nitsi.machine")
self.log.error("No such file: {}".format(self.image))
self.root_uid = root_uid
- self.disk = disk(image)
+ self.disk = disk.disk(image)
self.username = username
self.password = password
return elem.text
def check_is_booted_up(self):
- serial_con = serial_connection(self.get_serial_device())
+ serial_con = serial_connection.serial_connection(self.get_serial_device())
serial_con.write("\n")
# This will block till the domain is booted up
#serial_con.close()
- def login(self, log_file):
+ def login(self, log_file, log_start_time=None, longest_machine_name=10):
try:
- self.serial_con = serial_connection(self.get_serial_device(), username=self.username, log_file=log_file, name=self.name)
+ self.serial_con = serial_connection.serial_connection(self.get_serial_device(),
+ username=self.username,
+ log_file=log_file,
+ log_start_time=log_start_time,
+ name=self.name,
+ longest_machine_name=longest_machine_name)
self.serial_con.login(self.password)
except BaseException as e:
self.log.error("Could not connect to the domain via serial console")
self.log.error(e)
finally:
self.disk.umount("/")
- self.disk.close()
\ No newline at end of file
+ self.disk.close()