Cleanup imports part 2

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

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 1f7728f2f3b4747c40e5960b72b64a8e4abe2583..497b017589c09b90088a2c735d1b777991cca8b4 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -1,18 +1,13 @@
 #!/usr/bin/python3
 
-
+import configparser
 import libvirt
-
+import logging
 import os
-
-import configparser
-
 import time
 
-from nitsi.virtual_environ import virtual_environ
-from nitsi.recipe import recipe
-
-import logging
+from . import recipe
+from . import virtual_environ
 
 logger = logging.getLogger("nitsi.test")
 
@@ -63,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()
 
@@ -96,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)
 
@@ -124,6 +119,3 @@ class test():
 
         for name in self.virtual_environ.network_names:
             self.virtual_networks[name].undefine()
-
-
-