14 files changed, 23 insertions, 18 deletions
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/__init__.py
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fe49cca61..026c01fa2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -33,7 +33,7 @@ ENV repos_dir /home/opnfv/repos
 ENV creds /home/opnfv/functest/conf/openstack.creds
 ENV TERM xterm
 ENV COLORTERM gnome-terminal
-ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/functest/testcases/:/home/opnfv/repos/functest/utils/
+ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/
 WORKDIR /home/opnfv
 
 # Packaged dependencies
diff --git a/testcases/Controllers/ODL/CI/odlreport2db.py b/testcases/Controllers/ODL/CI/odlreport2db.py
index 983633ad8..9a87deac0 100644
--- a/testcases/Controllers/ODL/CI/odlreport2db.py
+++ b/testcases/Controllers/ODL/CI/odlreport2db.py
@@ -27,7 +27,7 @@ import sys
 import xmltodict
 import yaml
 
-import functest_utils
+import functest.utils.functest_utils as functest_utils
 
 
 def usage():
diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
index f6b7f61c7..f106526af 100644
--- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
@@ -22,7 +22,7 @@ import re
 import time
 import yaml
 
-import functest_utils
+import functest.utils.functest_utils as functest_utils
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-i", "--installer", help="Installer type")
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
index 7d37df901..6c753b024 100755
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
@@ -30,8 +30,8 @@ from keystoneclient.v2_0 import client as keystoneclient
 from neutronclient.v2_0 import client as neutronclient
 from cinderclient import client as cinderclient
 
-import functest_utils
-import openstack_utils
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as openstack_utils
 
 """ tests configuration """
 tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
index d8c477b37..68961d824 100644
--- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
@@ -28,8 +28,8 @@ import ConfigParser
 import keystoneclient.v2_0.client as ksclient
 from neutronclient.v2_0 import client as neutronclient
 
-import functest_utils
-import openstack_utils
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as openstack_utils
 
 modes = ['full', 'smoke', 'baremetal', 'compute', 'data_processing',
          'identity', 'image', 'network', 'object_storage', 'orchestration',
diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 942805527..649d4f7ec 100755
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -14,10 +14,13 @@ import shutil
 import subprocess
 import sys
 import yaml
-import functest_utils
-import openstack_utils
+
 from neutronclient.v2_0 import client as neutronclient
 
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as openstack_utils
+
+
 actions = ['start', 'check', 'clean']
 parser = argparse.ArgumentParser()
 parser.add_argument("action", help="Possible actions are: "
diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py
index 978750b2d..e9ac3df9f 100644
--- a/testcases/features/doctor.py
+++ b/testcases/features/doctor.py
@@ -18,7 +18,7 @@ import logging
 import time
 import yaml
 
-import functest_utils
+import functest.utils.functest_utils as functest_utils
 
 with open('/home/opnfv/functest/conf/config_functest.yaml') as f:
     functest_yaml = yaml.safe_load(f)
diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index 794841fbf..179ebca55 100644
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -22,8 +22,8 @@ import glanceclient.client as glclient
 import novaclient.client as nvclient
 from neutronclient.v2_0 import client as ntclient
 
-import functest_utils
-import openstack_utils
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as openstack_utils
 
 parser = argparse.ArgumentParser()
 
diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py
index 6f99d5930..19aa0271f 100644
--- a/testcases/vIMS/CI/vIMS.py
+++ b/testcases/vIMS/CI/vIMS.py
@@ -28,10 +28,12 @@ import novaclient.client as nvclient
 from neutronclient.v2_0 import client as ntclient
 
 import clearwater
-import functest_utils
-import openstack_utils
 import orchestrator
 
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as openstack_utils
+
+
 pp = pprint.PrettyPrinter(indent=4)
 
 
diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/vPing/CI/libraries/vPing_ssh.py
index 66b3f10e0..acf3065db 100644
--- a/testcases/vPing/CI/libraries/vPing_ssh.py
+++ b/testcases/vPing/CI/libraries/vPing_ssh.py
@@ -29,8 +29,8 @@ from neutronclient.v2_0 import client as neutronclient
 from keystoneclient.v2_0 import client as keystoneclient
 from glanceclient import client as glanceclient
 
-import functest_utils
-import openstack_utils
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as openstack_utils
 
 pp = pprint.PrettyPrinter(indent=4)
 
diff --git a/testcases/vPing/CI/libraries/vPing_userdata.py b/testcases/vPing/CI/libraries/vPing_userdata.py
index 09acb2df2..862343c1b 100644
--- a/testcases/vPing/CI/libraries/vPing_userdata.py
+++ b/testcases/vPing/CI/libraries/vPing_userdata.py
@@ -27,8 +27,8 @@ from neutronclient.v2_0 import client as neutronclient
 from keystoneclient.v2_0 import client as keystoneclient
 from glanceclient import client as glanceclient
 
-import functest_utils
-import openstack_utils
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as openstack_utils
 
 pp = pprint.PrettyPrinter(indent=4)
 
diff --git a/testcases/functest_utils.py b/utils/functest_utils.py
index 8eba43be8..8eba43be8 100644
--- a/testcases/functest_utils.py
+++ b/utils/functest_utils.py
diff --git a/testcases/openstack_utils.py b/utils/openstack_utils.py
index ff3968d67..ff3968d67 100644
--- a/testcases/openstack_utils.py
+++ b/utils/openstack_utils.py