import os
import xml.etree.ElementTree as ET
-from .disk import disk
-from .serial_connection import serial_connection
+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
def login(self, log_file, log_start_time=None, longest_machine_name=10):
try:
- self.serial_con = serial_connection(self.get_serial_device(),
+ self.serial_con = serial_connection.serial_connection(self.get_serial_device(),
username=self.username,
log_file=log_file,
log_start_time=log_start_time,
import sys
import time
-from .logger import TestFormatter
+from . import logger
-logger = logging.getLogger("nitsi.serial")
+log = logging.getLogger("nitsi.serial")
class serial_connection():
def __init__(self, device, username=None, log_file=None, name=None, log_start_time=None, longest_machine_name=10):
self.username = username
self.name = name
self.log_file = log_file
- self.log = logger.getChild(name)
+ self.log = log.getChild(name)
self.log.setLevel(logging.INFO)
self.con = serial.Serial(device)
log_file_handler = logging.FileHandler(self.log_file)
log_file_handler.setLevel(logging.INFO)
log_file_handler.terminator = ""
- formatter = TestFormatter(name=self.name,
+ formatter = logger.TestFormatter(name=self.name,
start_time=log_start_time,
longest_machine_name=longest_machine_name)
log_file_handler.setFormatter(formatter)
@property
def in_waiting(self):
in_waiting_before = 0
- sleep(0.5)
+ time.sleep(0.5)
while in_waiting_before != self.con.in_waiting:
in_waiting_before = self.con.in_waiting
- sleep(0.5)
+ time.sleep(0.5)
return self.con.in_waiting
import os
import time
-from .recipe import recipe
-from .virtual_environ import virtual_environ
+from . import recipe
+from . import virtual_environ
logger = logging.getLogger("nitsi.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()
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)
import logging
import os
-from .machine import machine
-from .network import network
+from . import machine
+from . import network
logger = logging.getLogger("nitsi.virtual_environ")
networks = {}
for _network in self.networks:
self.log.debug(_network)
- networks.setdefault(_network, network(self.con, os.path.normpath(self.path + "/" + self.config[_network]["xml_file"])))
+ networks.setdefault(_network, network.network(self.con, os.path.normpath(self.path + "/" + self.config[_network]["xml_file"])))
return networks
def get_machines(self):
machines = {}
for _machine in self.machines:
self.log.debug(_machine)
- machines.setdefault(_machine, machine(
+ machines.setdefault(_machine, machine.machine(
self.con,
os.path.normpath(self.path + "/" + self.config[_machine]["xml_file"]),
os.path.normpath(self.path + "/" + self.config[_machine]["snapshot_xml_file"]),