From c34c371e963f04f44339c07dfcd40b7814e3217f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 18 May 2013 07:26:28 -0700
Subject: [PATCH] Move tests into the novaclient package.

tests/__init__.py implies a package in the global namespace. These
tests are not global python tests, but rather tests for novaclient.

Change-Id: Ifeb8082aa010d15dddc9ae02e35589bc78ad48cc
---
 .testr.conf                                                   | 2 +-
 {tests => novaclient/tests}/__init__.py                       | 0
 {tests => novaclient/tests}/fakes.py                          | 0
 {tests => novaclient/tests}/test_auth_plugins.py              | 2 +-
 {tests => novaclient/tests}/test_base.py                      | 4 ++--
 {tests => novaclient/tests}/test_client.py                    | 2 +-
 {tests => novaclient/tests}/test_discover.py                  | 2 +-
 {tests => novaclient/tests}/test_http.py                      | 2 +-
 {tests => novaclient/tests}/test_service_catalog.py           | 2 +-
 {tests => novaclient/tests}/test_shell.py                     | 2 +-
 {tests => novaclient/tests}/test_utils.py                     | 2 +-
 {tests => novaclient/tests}/utils.py                          | 0
 {tests => novaclient/tests}/v1_1/__init__.py                  | 0
 {tests => novaclient/tests}/v1_1/contrib/__init__.py          | 0
 {tests => novaclient/tests}/v1_1/contrib/fakes.py             | 2 +-
 {tests => novaclient/tests}/v1_1/contrib/test_baremetal.py    | 4 ++--
 .../tests}/v1_1/contrib/test_instance_actions.py              | 4 ++--
 .../tests}/v1_1/contrib/test_list_extensions.py               | 4 ++--
 .../tests}/v1_1/contrib/test_tenant_networks.py               | 4 ++--
 {tests => novaclient/tests}/v1_1/fakes.py                     | 4 ++--
 {tests => novaclient/tests}/v1_1/test_agents.py               | 4 ++--
 {tests => novaclient/tests}/v1_1/test_aggregates.py           | 4 ++--
 {tests => novaclient/tests}/v1_1/test_auth.py                 | 2 +-
 {tests => novaclient/tests}/v1_1/test_availability_zone.py    | 4 ++--
 {tests => novaclient/tests}/v1_1/test_certs.py                | 4 ++--
 {tests => novaclient/tests}/v1_1/test_cloudpipe.py            | 4 ++--
 {tests => novaclient/tests}/v1_1/test_coverage_ext.py         | 4 ++--
 {tests => novaclient/tests}/v1_1/test_fixed_ips.py            | 4 ++--
 {tests => novaclient/tests}/v1_1/test_flavor_access.py        | 4 ++--
 {tests => novaclient/tests}/v1_1/test_flavors.py              | 4 ++--
 {tests => novaclient/tests}/v1_1/test_floating_ip_dns.py      | 4 ++--
 {tests => novaclient/tests}/v1_1/test_floating_ip_pools.py    | 4 ++--
 {tests => novaclient/tests}/v1_1/test_floating_ips.py         | 4 ++--
 {tests => novaclient/tests}/v1_1/test_floating_ips_bulk.py    | 4 ++--
 {tests => novaclient/tests}/v1_1/test_fping.py                | 4 ++--
 {tests => novaclient/tests}/v1_1/test_hosts.py                | 4 ++--
 {tests => novaclient/tests}/v1_1/test_hypervisors.py          | 4 ++--
 {tests => novaclient/tests}/v1_1/test_images.py               | 4 ++--
 {tests => novaclient/tests}/v1_1/test_keypairs.py             | 4 ++--
 {tests => novaclient/tests}/v1_1/test_limits.py               | 4 ++--
 {tests => novaclient/tests}/v1_1/test_networks.py             | 4 ++--
 {tests => novaclient/tests}/v1_1/test_quota_classes.py        | 4 ++--
 {tests => novaclient/tests}/v1_1/test_quotas.py               | 4 ++--
 {tests => novaclient/tests}/v1_1/test_security_group_rules.py | 4 ++--
 {tests => novaclient/tests}/v1_1/test_security_groups.py      | 4 ++--
 {tests => novaclient/tests}/v1_1/test_servers.py              | 4 ++--
 {tests => novaclient/tests}/v1_1/test_services.py             | 4 ++--
 {tests => novaclient/tests}/v1_1/test_shell.py                | 4 ++--
 {tests => novaclient/tests}/v1_1/test_usage.py                | 4 ++--
 {tests => novaclient/tests}/v1_1/testfile.txt                 | 0
 {tests => novaclient/tests}/v1_1/utils.py                     | 0
 51 files changed, 78 insertions(+), 78 deletions(-)
 rename {tests => novaclient/tests}/__init__.py (100%)
 rename {tests => novaclient/tests}/fakes.py (100%)
 rename {tests => novaclient/tests}/test_auth_plugins.py (99%)
 rename {tests => novaclient/tests}/test_base.py (96%)
 rename {tests => novaclient/tests}/test_client.py (99%)
 rename {tests => novaclient/tests}/test_discover.py (98%)
 rename {tests => novaclient/tests}/test_http.py (99%)
 rename {tests => novaclient/tests}/test_service_catalog.py (99%)
 rename {tests => novaclient/tests}/test_shell.py (99%)
 rename {tests => novaclient/tests}/test_utils.py (99%)
 rename {tests => novaclient/tests}/utils.py (100%)
 rename {tests => novaclient/tests}/v1_1/__init__.py (100%)
 rename {tests => novaclient/tests}/v1_1/contrib/__init__.py (100%)
 rename {tests => novaclient/tests}/v1_1/contrib/fakes.py (99%)
 rename {tests => novaclient/tests}/v1_1/contrib/test_baremetal.py (96%)
 rename {tests => novaclient/tests}/v1_1/contrib/test_instance_actions.py (94%)
 rename {tests => novaclient/tests}/v1_1/contrib/test_list_extensions.py (88%)
 rename {tests => novaclient/tests}/v1_1/contrib/test_tenant_networks.py (95%)
 rename {tests => novaclient/tests}/v1_1/fakes.py (99%)
 rename {tests => novaclient/tests}/v1_1/test_agents.py (97%)
 rename {tests => novaclient/tests}/v1_1/test_aggregates.py (98%)
 rename {tests => novaclient/tests}/v1_1/test_auth.py (99%)
 rename {tests => novaclient/tests}/v1_1/test_availability_zone.py (97%)
 rename {tests => novaclient/tests}/v1_1/test_certs.py (85%)
 rename {tests => novaclient/tests}/v1_1/test_cloudpipe.py (91%)
 rename {tests => novaclient/tests}/v1_1/test_coverage_ext.py (95%)
 rename {tests => novaclient/tests}/v1_1/test_fixed_ips.py (95%)
 rename {tests => novaclient/tests}/v1_1/test_flavor_access.py (96%)
 rename {tests => novaclient/tests}/v1_1/test_flavors.py (98%)
 rename {tests => novaclient/tests}/v1_1/test_floating_ip_dns.py (97%)
 rename {tests => novaclient/tests}/v1_1/test_floating_ip_pools.py (93%)
 rename {tests => novaclient/tests}/v1_1/test_floating_ips.py (96%)
 rename {tests => novaclient/tests}/v1_1/test_floating_ips_bulk.py (97%)
 rename {tests => novaclient/tests}/v1_1/test_fping.py (96%)
 rename {tests => novaclient/tests}/v1_1/test_hosts.py (96%)
 rename {tests => novaclient/tests}/v1_1/test_hypervisors.py (98%)
 rename {tests => novaclient/tests}/v1_1/test_images.py (95%)
 rename {tests => novaclient/tests}/v1_1/test_keypairs.py (93%)
 rename {tests => novaclient/tests}/v1_1/test_limits.py (96%)
 rename {tests => novaclient/tests}/v1_1/test_networks.py (97%)
 rename {tests => novaclient/tests}/v1_1/test_quota_classes.py (94%)
 rename {tests => novaclient/tests}/v1_1/test_quotas.py (95%)
 rename {tests => novaclient/tests}/v1_1/test_security_group_rules.py (96%)
 rename {tests => novaclient/tests}/v1_1/test_security_groups.py (96%)
 rename {tests => novaclient/tests}/v1_1/test_servers.py (99%)
 rename {tests => novaclient/tests}/v1_1/test_services.py (97%)
 rename {tests => novaclient/tests}/v1_1/test_shell.py (99%)
 rename {tests => novaclient/tests}/v1_1/test_usage.py (93%)
 rename {tests => novaclient/tests}/v1_1/testfile.txt (100%)
 rename {tests => novaclient/tests}/v1_1/utils.py (100%)

diff --git a/.testr.conf b/.testr.conf
index 2109af6ce..60477e871 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tests/__init__.py b/novaclient/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to novaclient/tests/__init__.py
diff --git a/tests/fakes.py b/novaclient/tests/fakes.py
similarity index 100%
rename from tests/fakes.py
rename to novaclient/tests/fakes.py
diff --git a/tests/test_auth_plugins.py b/novaclient/tests/test_auth_plugins.py
similarity index 99%
rename from tests/test_auth_plugins.py
rename to novaclient/tests/test_auth_plugins.py
index fae63247b..c4b37b57d 100644
--- a/tests/test_auth_plugins.py
+++ b/novaclient/tests/test_auth_plugins.py
@@ -26,7 +26,7 @@ except ImportError:
 from novaclient import auth_plugin
 from novaclient import exceptions
 from novaclient.v1_1 import client
-from tests import utils
+from novaclient.tests import utils
 
 
 def mock_http_request(resp=None):
diff --git a/tests/test_base.py b/novaclient/tests/test_base.py
similarity index 96%
rename from tests/test_base.py
rename to novaclient/tests/test_base.py
index 30bea5708..58aeae962 100644
--- a/tests/test_base.py
+++ b/novaclient/tests/test_base.py
@@ -1,8 +1,8 @@
 from novaclient import base
 from novaclient import exceptions
 from novaclient.v1_1 import flavors
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/test_client.py b/novaclient/tests/test_client.py
similarity index 99%
rename from tests/test_client.py
rename to novaclient/tests/test_client.py
index 1f61b1716..3e74cdba4 100644
--- a/tests/test_client.py
+++ b/novaclient/tests/test_client.py
@@ -19,7 +19,7 @@ import requests
 
 import novaclient.client
 import novaclient.v1_1.client
-from tests import utils
+from novaclient.tests import utils
 
 
 class ClientTest(utils.TestCase):
diff --git a/tests/test_discover.py b/novaclient/tests/test_discover.py
similarity index 98%
rename from tests/test_discover.py
rename to novaclient/tests/test_discover.py
index 3b78f0caf..29c9e4756 100644
--- a/tests/test_discover.py
+++ b/novaclient/tests/test_discover.py
@@ -19,7 +19,7 @@ import inspect
 import pkg_resources
 
 import novaclient.shell
-from tests import utils
+from novaclient.tests import utils
 
 
 class DiscoverTest(utils.TestCase):
diff --git a/tests/test_http.py b/novaclient/tests/test_http.py
similarity index 99%
rename from tests/test_http.py
rename to novaclient/tests/test_http.py
index 7925a91f0..015928015 100644
--- a/tests/test_http.py
+++ b/novaclient/tests/test_http.py
@@ -3,7 +3,7 @@ import requests
 
 from novaclient import client
 from novaclient import exceptions
-from tests import utils
+from novaclient.tests import utils
 
 
 fake_response = utils.TestResponse({
diff --git a/tests/test_service_catalog.py b/novaclient/tests/test_service_catalog.py
similarity index 99%
rename from tests/test_service_catalog.py
rename to novaclient/tests/test_service_catalog.py
index 4ac7703fe..1d73c73dc 100644
--- a/tests/test_service_catalog.py
+++ b/novaclient/tests/test_service_catalog.py
@@ -1,6 +1,6 @@
 from novaclient import exceptions
 from novaclient import service_catalog
-from tests import utils
+from novaclient.tests import utils
 
 
 # Taken directly from keystone/content/common/samples/auth.json
diff --git a/tests/test_shell.py b/novaclient/tests/test_shell.py
similarity index 99%
rename from tests/test_shell.py
rename to novaclient/tests/test_shell.py
index ae78815d2..91c34bccc 100644
--- a/tests/test_shell.py
+++ b/novaclient/tests/test_shell.py
@@ -9,7 +9,7 @@ from testtools import matchers
 import novaclient.client
 from novaclient import exceptions
 import novaclient.shell
-from tests import utils
+from novaclient.tests import utils
 
 FAKE_ENV = {'OS_USERNAME': 'username',
             'OS_PASSWORD': 'password',
diff --git a/tests/test_utils.py b/novaclient/tests/test_utils.py
similarity index 99%
rename from tests/test_utils.py
rename to novaclient/tests/test_utils.py
index 7a0949ed2..0bd396a75 100644
--- a/tests/test_utils.py
+++ b/novaclient/tests/test_utils.py
@@ -6,7 +6,7 @@ import mock
 from novaclient import exceptions
 from novaclient import utils
 from novaclient import base
-from tests import utils as test_utils
+from novaclient.tests import utils as test_utils
 
 UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0'
 
diff --git a/tests/utils.py b/novaclient/tests/utils.py
similarity index 100%
rename from tests/utils.py
rename to novaclient/tests/utils.py
diff --git a/tests/v1_1/__init__.py b/novaclient/tests/v1_1/__init__.py
similarity index 100%
rename from tests/v1_1/__init__.py
rename to novaclient/tests/v1_1/__init__.py
diff --git a/tests/v1_1/contrib/__init__.py b/novaclient/tests/v1_1/contrib/__init__.py
similarity index 100%
rename from tests/v1_1/contrib/__init__.py
rename to novaclient/tests/v1_1/contrib/__init__.py
diff --git a/tests/v1_1/contrib/fakes.py b/novaclient/tests/v1_1/contrib/fakes.py
similarity index 99%
rename from tests/v1_1/contrib/fakes.py
rename to novaclient/tests/v1_1/contrib/fakes.py
index 6983406e7..a7bee0429 100644
--- a/tests/v1_1/contrib/fakes.py
+++ b/novaclient/tests/v1_1/contrib/fakes.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from novaclient.v1_1 import client
-from tests.v1_1 import fakes
+from novaclient.tests.v1_1 import fakes
 
 
 class FakeClient(fakes.FakeClient):
diff --git a/tests/v1_1/contrib/test_baremetal.py b/novaclient/tests/v1_1/contrib/test_baremetal.py
similarity index 96%
rename from tests/v1_1/contrib/test_baremetal.py
rename to novaclient/tests/v1_1/contrib/test_baremetal.py
index 6925f18db..88b129f0f 100644
--- a/tests/v1_1/contrib/test_baremetal.py
+++ b/novaclient/tests/v1_1/contrib/test_baremetal.py
@@ -17,8 +17,8 @@
 from novaclient import extension
 from novaclient.v1_1.contrib import baremetal
 
-from tests import utils
-from tests.v1_1.contrib import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1.contrib import fakes
 
 
 extensions = [
diff --git a/tests/v1_1/contrib/test_instance_actions.py b/novaclient/tests/v1_1/contrib/test_instance_actions.py
similarity index 94%
rename from tests/v1_1/contrib/test_instance_actions.py
rename to novaclient/tests/v1_1/contrib/test_instance_actions.py
index 8f8e1cd58..cdfa14985 100644
--- a/tests/v1_1/contrib/test_instance_actions.py
+++ b/novaclient/tests/v1_1/contrib/test_instance_actions.py
@@ -15,8 +15,8 @@
 from novaclient import extension
 from novaclient.v1_1.contrib import instance_action
 
-from tests import utils
-from tests.v1_1.contrib import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1.contrib import fakes
 
 
 extensions = [
diff --git a/tests/v1_1/contrib/test_list_extensions.py b/novaclient/tests/v1_1/contrib/test_list_extensions.py
similarity index 88%
rename from tests/v1_1/contrib/test_list_extensions.py
rename to novaclient/tests/v1_1/contrib/test_list_extensions.py
index 8b0651158..f9ede2972 100644
--- a/tests/v1_1/contrib/test_list_extensions.py
+++ b/novaclient/tests/v1_1/contrib/test_list_extensions.py
@@ -1,8 +1,8 @@
 from novaclient import extension
 from novaclient.v1_1.contrib import list_extensions
 
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 extensions = [
diff --git a/tests/v1_1/contrib/test_tenant_networks.py b/novaclient/tests/v1_1/contrib/test_tenant_networks.py
similarity index 95%
rename from tests/v1_1/contrib/test_tenant_networks.py
rename to novaclient/tests/v1_1/contrib/test_tenant_networks.py
index a79f76dd1..bb2cbaf8c 100644
--- a/tests/v1_1/contrib/test_tenant_networks.py
+++ b/novaclient/tests/v1_1/contrib/test_tenant_networks.py
@@ -18,8 +18,8 @@
 from novaclient import extension
 from novaclient.v1_1.contrib import tenant_networks
 
-from tests import utils
-from tests.v1_1.contrib import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1.contrib import fakes
 
 
 extensions = [
diff --git a/tests/v1_1/fakes.py b/novaclient/tests/v1_1/fakes.py
similarity index 99%
rename from tests/v1_1/fakes.py
rename to novaclient/tests/v1_1/fakes.py
index c13e16edd..924d39051 100644
--- a/tests/v1_1/fakes.py
+++ b/novaclient/tests/v1_1/fakes.py
@@ -19,8 +19,8 @@ import urlparse
 
 from novaclient import client as base_client
 from novaclient.v1_1 import client
-from tests import fakes
-from tests import utils
+from novaclient.tests import fakes
+from novaclient.tests import utils
 
 
 class FakeClient(fakes.FakeClient, client.Client):
diff --git a/tests/v1_1/test_agents.py b/novaclient/tests/v1_1/test_agents.py
similarity index 97%
rename from tests/v1_1/test_agents.py
rename to novaclient/tests/v1_1/test_agents.py
index f599046e4..c9eaf3787 100644
--- a/tests/v1_1/test_agents.py
+++ b/novaclient/tests/v1_1/test_agents.py
@@ -16,8 +16,8 @@
 #    under the License.
 
 from novaclient.v1_1 import agents
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_aggregates.py b/novaclient/tests/v1_1/test_aggregates.py
similarity index 98%
rename from tests/v1_1/test_aggregates.py
rename to novaclient/tests/v1_1/test_aggregates.py
index 0b84067c6..f46d0871d 100644
--- a/tests/v1_1/test_aggregates.py
+++ b/novaclient/tests/v1_1/test_aggregates.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 from novaclient.v1_1 import aggregates
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_auth.py b/novaclient/tests/v1_1/test_auth.py
similarity index 99%
rename from tests/v1_1/test_auth.py
rename to novaclient/tests/v1_1/test_auth.py
index f5ddf35f8..11a5e420d 100644
--- a/tests/v1_1/test_auth.py
+++ b/novaclient/tests/v1_1/test_auth.py
@@ -6,7 +6,7 @@ import requests
 
 from novaclient.v1_1 import client
 from novaclient import exceptions
-from tests import utils
+from novaclient.tests import utils
 
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):
diff --git a/tests/v1_1/test_availability_zone.py b/novaclient/tests/v1_1/test_availability_zone.py
similarity index 97%
rename from tests/v1_1/test_availability_zone.py
rename to novaclient/tests/v1_1/test_availability_zone.py
index 56a1480fb..896b78ad7 100644
--- a/tests/v1_1/test_availability_zone.py
+++ b/novaclient/tests/v1_1/test_availability_zone.py
@@ -16,8 +16,8 @@
 
 from novaclient.v1_1 import availability_zones
 from novaclient.v1_1 import shell
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_certs.py b/novaclient/tests/v1_1/test_certs.py
similarity index 85%
rename from tests/v1_1/test_certs.py
rename to novaclient/tests/v1_1/test_certs.py
index 5cfef0826..ff1f61121 100644
--- a/tests/v1_1/test_certs.py
+++ b/novaclient/tests/v1_1/test_certs.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import certs
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_cloudpipe.py b/novaclient/tests/v1_1/test_cloudpipe.py
similarity index 91%
rename from tests/v1_1/test_cloudpipe.py
rename to novaclient/tests/v1_1/test_cloudpipe.py
index ad1e5bd7a..e428629f2 100644
--- a/tests/v1_1/test_cloudpipe.py
+++ b/novaclient/tests/v1_1/test_cloudpipe.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import cloudpipe
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_coverage_ext.py b/novaclient/tests/v1_1/test_coverage_ext.py
similarity index 95%
rename from tests/v1_1/test_coverage_ext.py
rename to novaclient/tests/v1_1/test_coverage_ext.py
index 27b33da47..0c78afaa4 100644
--- a/tests/v1_1/test_coverage_ext.py
+++ b/novaclient/tests/v1_1/test_coverage_ext.py
@@ -17,8 +17,8 @@
 # See: http://wiki.openstack.org/Nova/CoverageExtension for more information
 # and usage explanation for this API extension
 
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_fixed_ips.py b/novaclient/tests/v1_1/test_fixed_ips.py
similarity index 95%
rename from tests/v1_1/test_fixed_ips.py
rename to novaclient/tests/v1_1/test_fixed_ips.py
index d8726b657..6881d1b40 100644
--- a/tests/v1_1/test_fixed_ips.py
+++ b/novaclient/tests/v1_1/test_fixed_ips.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
 
 cs = fakes.FakeClient()
 
diff --git a/tests/v1_1/test_flavor_access.py b/novaclient/tests/v1_1/test_flavor_access.py
similarity index 96%
rename from tests/v1_1/test_flavor_access.py
rename to novaclient/tests/v1_1/test_flavor_access.py
index 929b51516..aea57a511 100644
--- a/tests/v1_1/test_flavor_access.py
+++ b/novaclient/tests/v1_1/test_flavor_access.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 from novaclient.v1_1 import flavor_access
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_flavors.py b/novaclient/tests/v1_1/test_flavors.py
similarity index 98%
rename from tests/v1_1/test_flavors.py
rename to novaclient/tests/v1_1/test_flavors.py
index 936035330..eb7be2a4c 100644
--- a/tests/v1_1/test_flavors.py
+++ b/novaclient/tests/v1_1/test_flavors.py
@@ -1,7 +1,7 @@
 from novaclient import exceptions
 from novaclient.v1_1 import flavors
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_floating_ip_dns.py b/novaclient/tests/v1_1/test_floating_ip_dns.py
similarity index 97%
rename from tests/v1_1/test_floating_ip_dns.py
rename to novaclient/tests/v1_1/test_floating_ip_dns.py
index 868fc054a..96cf90f43 100644
--- a/tests/v1_1/test_floating_ip_dns.py
+++ b/novaclient/tests/v1_1/test_floating_ip_dns.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import floating_ip_dns
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_floating_ip_pools.py b/novaclient/tests/v1_1/test_floating_ip_pools.py
similarity index 93%
rename from tests/v1_1/test_floating_ip_pools.py
rename to novaclient/tests/v1_1/test_floating_ip_pools.py
index 6091b2888..ba0fcb517 100644
--- a/tests/v1_1/test_floating_ip_pools.py
+++ b/novaclient/tests/v1_1/test_floating_ip_pools.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 from novaclient.v1_1 import floating_ip_pools
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_floating_ips.py b/novaclient/tests/v1_1/test_floating_ips.py
similarity index 96%
rename from tests/v1_1/test_floating_ips.py
rename to novaclient/tests/v1_1/test_floating_ips.py
index f2895c6db..04088e097 100644
--- a/tests/v1_1/test_floating_ips.py
+++ b/novaclient/tests/v1_1/test_floating_ips.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 from novaclient.v1_1 import floating_ips
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_floating_ips_bulk.py b/novaclient/tests/v1_1/test_floating_ips_bulk.py
similarity index 97%
rename from tests/v1_1/test_floating_ips_bulk.py
rename to novaclient/tests/v1_1/test_floating_ips_bulk.py
index c7706eca0..27acd5c7a 100644
--- a/tests/v1_1/test_floating_ips_bulk.py
+++ b/novaclient/tests/v1_1/test_floating_ips_bulk.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from novaclient.v1_1 import floating_ips_bulk
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_fping.py b/novaclient/tests/v1_1/test_fping.py
similarity index 96%
rename from tests/v1_1/test_fping.py
rename to novaclient/tests/v1_1/test_fping.py
index c17da741d..7f240e299 100644
--- a/tests/v1_1/test_fping.py
+++ b/novaclient/tests/v1_1/test_fping.py
@@ -16,8 +16,8 @@
 #    under the License.
 
 from novaclient.v1_1 import fping
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_hosts.py b/novaclient/tests/v1_1/test_hosts.py
similarity index 96%
rename from tests/v1_1/test_hosts.py
rename to novaclient/tests/v1_1/test_hosts.py
index 15bb3cb01..348d59cc1 100644
--- a/tests/v1_1/test_hosts.py
+++ b/novaclient/tests/v1_1/test_hosts.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import hosts
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_hypervisors.py b/novaclient/tests/v1_1/test_hypervisors.py
similarity index 98%
rename from tests/v1_1/test_hypervisors.py
rename to novaclient/tests/v1_1/test_hypervisors.py
index 12dd2de05..8d59d5984 100644
--- a/tests/v1_1/test_hypervisors.py
+++ b/novaclient/tests/v1_1/test_hypervisors.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_images.py b/novaclient/tests/v1_1/test_images.py
similarity index 95%
rename from tests/v1_1/test_images.py
rename to novaclient/tests/v1_1/test_images.py
index a4f8e6416..b545cedd5 100644
--- a/tests/v1_1/test_images.py
+++ b/novaclient/tests/v1_1/test_images.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import images
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_keypairs.py b/novaclient/tests/v1_1/test_keypairs.py
similarity index 93%
rename from tests/v1_1/test_keypairs.py
rename to novaclient/tests/v1_1/test_keypairs.py
index 10afd2497..2814c88ef 100644
--- a/tests/v1_1/test_keypairs.py
+++ b/novaclient/tests/v1_1/test_keypairs.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import keypairs
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_limits.py b/novaclient/tests/v1_1/test_limits.py
similarity index 96%
rename from tests/v1_1/test_limits.py
rename to novaclient/tests/v1_1/test_limits.py
index 3a8fa745c..550c9c321 100644
--- a/tests/v1_1/test_limits.py
+++ b/novaclient/tests/v1_1/test_limits.py
@@ -1,7 +1,7 @@
 
 from novaclient.v1_1 import limits
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_networks.py b/novaclient/tests/v1_1/test_networks.py
similarity index 97%
rename from tests/v1_1/test_networks.py
rename to novaclient/tests/v1_1/test_networks.py
index 088f35574..d40ec53f2 100644
--- a/tests/v1_1/test_networks.py
+++ b/novaclient/tests/v1_1/test_networks.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import networks
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_quota_classes.py b/novaclient/tests/v1_1/test_quota_classes.py
similarity index 94%
rename from tests/v1_1/test_quota_classes.py
rename to novaclient/tests/v1_1/test_quota_classes.py
index a539ebeec..eceb606da 100644
--- a/tests/v1_1/test_quota_classes.py
+++ b/novaclient/tests/v1_1/test_quota_classes.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_quotas.py b/novaclient/tests/v1_1/test_quotas.py
similarity index 95%
rename from tests/v1_1/test_quotas.py
rename to novaclient/tests/v1_1/test_quotas.py
index 85a7a576a..69c2952f1 100644
--- a/tests/v1_1/test_quotas.py
+++ b/novaclient/tests/v1_1/test_quotas.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 cs = fakes.FakeClient()
 
diff --git a/tests/v1_1/test_security_group_rules.py b/novaclient/tests/v1_1/test_security_group_rules.py
similarity index 96%
rename from tests/v1_1/test_security_group_rules.py
rename to novaclient/tests/v1_1/test_security_group_rules.py
index acf1b7897..6a3a06c56 100644
--- a/tests/v1_1/test_security_group_rules.py
+++ b/novaclient/tests/v1_1/test_security_group_rules.py
@@ -1,7 +1,7 @@
 from novaclient import exceptions
 from novaclient.v1_1 import security_group_rules
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_security_groups.py b/novaclient/tests/v1_1/test_security_groups.py
similarity index 96%
rename from tests/v1_1/test_security_groups.py
rename to novaclient/tests/v1_1/test_security_groups.py
index 122ebe6a5..962d03822 100644
--- a/tests/v1_1/test_security_groups.py
+++ b/novaclient/tests/v1_1/test_security_groups.py
@@ -1,6 +1,6 @@
 from novaclient.v1_1 import security_groups
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_servers.py b/novaclient/tests/v1_1/test_servers.py
similarity index 99%
rename from tests/v1_1/test_servers.py
rename to novaclient/tests/v1_1/test_servers.py
index e44a35189..7120426c6 100644
--- a/tests/v1_1/test_servers.py
+++ b/novaclient/tests/v1_1/test_servers.py
@@ -6,8 +6,8 @@ import mock
 
 from novaclient import exceptions
 from novaclient.v1_1 import servers
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_services.py b/novaclient/tests/v1_1/test_services.py
similarity index 97%
rename from tests/v1_1/test_services.py
rename to novaclient/tests/v1_1/test_services.py
index 701b4cb0e..381fb143d 100644
--- a/tests/v1_1/test_services.py
+++ b/novaclient/tests/v1_1/test_services.py
@@ -16,8 +16,8 @@
 #    under the License.
 
 from novaclient.v1_1 import services
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/test_shell.py b/novaclient/tests/v1_1/test_shell.py
similarity index 99%
rename from tests/v1_1/test_shell.py
rename to novaclient/tests/v1_1/test_shell.py
index 51ccf509d..5b17b2b9e 100644
--- a/tests/v1_1/test_shell.py
+++ b/novaclient/tests/v1_1/test_shell.py
@@ -29,8 +29,8 @@ import novaclient.client
 from novaclient import exceptions
 from novaclient.openstack.common import timeutils
 import novaclient.shell
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
 
 
 class ShellFixture(fixtures.Fixture):
diff --git a/tests/v1_1/test_usage.py b/novaclient/tests/v1_1/test_usage.py
similarity index 93%
rename from tests/v1_1/test_usage.py
rename to novaclient/tests/v1_1/test_usage.py
index 10ca37db6..49b0baedf 100644
--- a/tests/v1_1/test_usage.py
+++ b/novaclient/tests/v1_1/test_usage.py
@@ -1,8 +1,8 @@
 import datetime
 
 from novaclient.v1_1 import usage
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/tests/v1_1/testfile.txt b/novaclient/tests/v1_1/testfile.txt
similarity index 100%
rename from tests/v1_1/testfile.txt
rename to novaclient/tests/v1_1/testfile.txt
diff --git a/tests/v1_1/utils.py b/novaclient/tests/v1_1/utils.py
similarity index 100%
rename from tests/v1_1/utils.py
rename to novaclient/tests/v1_1/utils.py