Convert all imports on the server to use absolute imports.

Signed-off-by: John Admanski <jadmanski@google.com>



git-svn-id: svn://test.kernel.org/autotest/trunk@1452 592f7852-d20e-0410-864c-8624ca9c26a4

10 files changed, 37 insertions, 52 deletions

diff --git a/server/autotest.py b/server/autotest.py
index 9a37e150..5fbaadb3 100644
--- a/server/autotest.py
+++ b/server/autotest.py
@@ -23,11 +23,9 @@ import tempfile
 import shutil
 import time
 
-import installable_object
-import utils
-import server_job
-from common import logging
-from common.error import *
+from autotest_lib.server import installable_object, utils, server_job
+from autotest_lib.client.common_lib import logging
+from autotest_lib.client.common_lib.error import *
 
 
 AUTOTEST_SVN  = 'svn://test.kernel.org/autotest/trunk/client'
diff --git a/server/deb_kernel.py b/server/deb_kernel.py
index ab10aeea..69b59fa7 100644
--- a/server/deb_kernel.py
+++ b/server/deb_kernel.py
@@ -15,15 +15,10 @@ stutsman@google.com (Ryan Stutsman)
 """
 
 
-import os
-import os.path
-import time
-import urllib
+import os, os.path, time, urllib
 
-import kernel
-import utils
-
-from common.error import *
+from autotest_lib.client.common_lib.error import *
+from autotest_lib.server import kernel, utils
 
 
 class DEBKernel(kernel.Kernel):
diff --git a/server/git.py b/server/git.py
index 829d2a2f..fce92aa5 100644
--- a/server/git.py
+++ b/server/git.py
@@ -12,13 +12,12 @@ ryanh@us.ibm.com (Ryan Harper)
 """
 
 
-import os
-import urllib2
+import os, urllib2
+
+from autotest_lib.client.common_lib.error import *
+from autotest_lib.server import utils, installable_object
+from autotest_lib.server.utils import *
 
-from common.error import *
-import utils
-from utils import *
-import installable_object
 
 class GitRepo(installable_object.InstallableObject):
 	"""
diff --git a/server/kvm.py b/server/kvm.py
index 166f7257..027940c9 100644
--- a/server/kvm.py
+++ b/server/kvm.py
@@ -16,11 +16,8 @@ stutsman@google.com (Ryan Stutsman)
 
 import os
 
-import hypervisor
-import utils
-import hosts
-
-from common.error import *
+from autotest_lib.client.common_lib.error import *
+from autotest_lib.server import hypervisor, utils, hosts
 
 
 _qemu_ifup_script= """\
diff --git a/server/rpm_kernel.py b/server/rpm_kernel.py
index 3b73e57e..f93f8561 100644
--- a/server/rpm_kernel.py
+++ b/server/rpm_kernel.py
@@ -14,17 +14,10 @@ poirier@google.com (Benjamin Poirier),
 stutsman@google.com (Ryan Stutsman)"""
 
 
-import kernel
+import os, os.path, time, urllib
 
-import os
-import os.path
-import time
-import urllib
-
-import kernel
-import utils
-
-from common.error import *
+from autotest_lib.client.common_lib.error import *
+from autotest_lib.server import kernel, utils
 
 
 class RPMKernel(kernel.Kernel):
diff --git a/server/server_job.py b/server/server_job.py
index 282bbdc3..0a1a94b1 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -34,12 +34,14 @@ def load_control_segment(name):
 preamble = """\
 import os, sys
 
-import hosts, autotest, kvm, git, standalone_profiler
-import source_kernel, rpm_kernel, deb_kernel, git_kernel
-from common.error import *
-from common import barrier
-from subcommand import *
-from utils import run, get_tmp_dir, sh_escape
+from autotest_lib.server import hosts, autotest, kvm, git, standalone_profiler
+from autotest_lib.server import source_kernel, rpm_kernel, deb_kernel
+from autotest_lib.server import git_kernel
+from autotest_lib.server.subcommand import *
+from autotest_lib.server.utils import run, get_tmp_dir, sh_escape
+
+from autotest_lib.client.common_lib.error import *
+from autotest_lib.client.common_lib import barrier
 
 autotest.Autotest.job = job
 hosts.SSHHost.job = job
@@ -705,7 +707,7 @@ class client_logger(object):
 # site_server_job.py may be non-existant or empty, make sure that an
 # appropriate site_server_job class is created nevertheless
 try:
-	from site_server_job import site_server_job
+	from autotest_lib.server.site_server_job import site_server_job
 except ImportError:
 	class site_server_job(base_server_job):
 		pass
diff --git a/server/standalone_profiler.py b/server/standalone_profiler.py
index 53c2dcfe..22801fd2 100644
--- a/server/standalone_profiler.py
+++ b/server/standalone_profiler.py
@@ -10,7 +10,7 @@ running through autotest.
 
 __author__ = 'cranger@google.com (Colby Ranger)'
 
-from common import barrier
+from autotest_lib.client.common_lib import barrier
 
 
 def generate_test(machines, hostname, profilers, timeout_start, timeout_stop,
diff --git a/server/subcommand.py b/server/subcommand.py
index acaf4d77..54d63de4 100644
--- a/server/subcommand.py
+++ b/server/subcommand.py
@@ -1,7 +1,8 @@
 __author__ = """Copyright Andy Whitcroft, Martin J. Bligh - 2006, 2007"""
 
 import sys, os, subprocess, traceback, time, utils, signal
-from common.error import *
+
+from autotest_lib.client.common_lib.error import *
 
 
 def parallel(tasklist, timeout=None):
diff --git a/server/test.py b/server/test.py
index b504a782..e8050806 100755
--- a/server/test.py
+++ b/server/test.py
@@ -5,20 +5,19 @@
 
 import os
 
-from subcommand import *
-from common.error import *
-from utils import *
+from autotest_lib.client.common_lib import test as common_test
+from autotest_lib.client.common_lib.error import *
+from autotest_lib.server.subcommand import *
+from autotest_lib.server.utils import *
 
-import common.test
 
-
-class test(common.test.base_test):
+class test(common_test.base_test):
 	pass
 
 
-testname = common.test.testname
+testname = common_test.testname
 
 
 def runtest(job, url, tag, args, dargs):
-	common.test.runtest(job, url, tag, args, dargs,
+	common_test.runtest(job, url, tag, args, dargs,
 			    locals(), globals())
diff --git a/server/utils.py b/server/utils.py
index 480e8ec3..ba0e5363 100644
--- a/server/utils.py
+++ b/server/utils.py
@@ -13,7 +13,8 @@ stutsman@google.com (Ryan Stutsman)
 """
 
 import atexit, os, re, shutil, textwrap, sys, tempfile, types, urllib
-from common.utils import *
+
+from autotest_lib.client.common_lib.utils import *
 
 
 # A dictionary of pid and a list of tmpdirs for that pid