Cleanup imports part 2

Fixes: #11717
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/src/nitsi/machine.py b/src/nitsi/machine.py
index 4e60323a159420531cbf1e652a6d34040a3bbacd..0b4617aed8dcbb0df1ec094a414dbfce73621e42 100644 (file)
--- a/src/nitsi/machine.py
+++ b/src/nitsi/machine.py
@@ -5,8 +5,8 @@ import logging
 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")
 
@@ -41,7 +41,7 @@ class 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
@@ -106,7 +106,7 @@ class machine():
         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
@@ -116,7 +116,7 @@ class machine():
 
     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,

diff --git a/src/nitsi/serial_connection.py b/src/nitsi/serial_connection.py
index 35683161eebcb201e2cc2eb205de0b423fde7eeb..3471ad360948d6e7d8064ac047609a59dea7442c 100644 (file)
--- a/src/nitsi/serial_connection.py
+++ b/src/nitsi/serial_connection.py
@@ -7,9 +7,9 @@ import serial
 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):
@@ -18,7 +18,7 @@ class serial_connection():
         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)
 
@@ -26,7 +26,7 @@ class serial_connection():
         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)
@@ -99,11 +99,11 @@ class serial_connection():
     @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
 

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 95db2136a047f96fc652d6e028b11da2dd5cab75..497b017589c09b90088a2c735d1b777991cca8b4 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -6,8 +6,8 @@ import logging
 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")
 
@@ -58,7 +58,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()
 
@@ -91,7 +91,7 @@ class test():
     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)
 

diff --git a/src/nitsi/virtual_environ.py b/src/nitsi/virtual_environ.py
index 1a086b51a886b7f8d2a76fb91c12f755cba5494c..f375cd60a6b9ae3dd8b2c49470e244d2086802e7 100644 (file)
--- a/src/nitsi/virtual_environ.py
+++ b/src/nitsi/virtual_environ.py
@@ -5,8 +5,8 @@ import libvirt
 import logging
 import os
 
-from .machine import machine
-from .network import network
+from . import machine
+from . import network
 
 logger = logging.getLogger("nitsi.virtual_environ")
 
@@ -60,14 +60,14 @@ class 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"]),