Move unit tests into unit test directory

In order to pave the way for functional testing, move existing unit
tests into a directory labeled unit. A subsequent patch will add a
directory for functional tests.

Change-Id: I0adb8b9f14451acb382c725d31f5387b4b6d82bb

novaclient/tests/unit/fixture_data/agents.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/aggregates.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/availability_zones.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class V1(base.Fixture):

novaclient/tests/unit/fixture_data/certs.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/cloudpipe.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/fixedips.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/floatingips.py

@@ -12,8 +12,8 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests import fakes
+from novaclient.tests.unit import fakes
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class FloatingFixture(base.Fixture):

novaclient/tests/unit/fixture_data/fping.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/hosts.py

@@ -13,7 +13,7 @@
 from oslo.serialization import jsonutils
 from six.moves.urllib import parse
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class BaseFixture(base.Fixture):

novaclient/tests/unit/fixture_data/hypervisors.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class V1(base.Fixture):

novaclient/tests/unit/fixture_data/images.py

@@ -12,8 +12,8 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests import fakes
+from novaclient.tests.unit import fakes
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class V1(base.Fixture):

novaclient/tests/unit/fixture_data/keypairs.py

@@ -12,8 +12,8 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests import fakes
+from novaclient.tests.unit import fakes
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class V1(base.Fixture):

novaclient/tests/unit/fixture_data/limits.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/networks.py

@@ -12,7 +12,7 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/quotas.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class V1(base.Fixture):

novaclient/tests/unit/fixture_data/security_group_rules.py

@@ -12,8 +12,8 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests import fakes
+from novaclient.tests.unit import fakes
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/security_groups.py

@@ -12,8 +12,8 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests import fakes
+from novaclient.tests.unit import fakes
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/server_groups.py

@@ -12,7 +12,7 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Fixture(base.Fixture):

novaclient/tests/unit/fixture_data/servers.py

@@ -12,8 +12,8 @@
 
 from oslo.serialization import jsonutils
 
-from novaclient.tests import fakes
+from novaclient.tests.unit import fakes
-from novaclient.tests.fixture_data import base
+from novaclient.tests.unit.fixture_data import base
 
 
 class Base(base.Fixture):
@@ -336,7 +336,7 @@ class V1(Base):
         #
         # Clear password: FooBar123
         #
-        # RSA Private Key: novaclient/tests/idfake.pem
+        # RSA Private Key: novaclient/tests/unit/idfake.pem
         #
         # Encrypted password
         # OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r

novaclient/tests/unit/test_auth_plugins.py

@@ -27,7 +27,7 @@ except ImportError:
 
 from novaclient import auth_plugin
 from novaclient import exceptions
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import client
 
 

novaclient/tests/unit/test_base.py

@@ -13,8 +13,8 @@
 
 from novaclient import base
 from novaclient import exceptions
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1 import flavors
 
 

novaclient/tests/unit/test_client.py

@@ -23,7 +23,7 @@ import requests
 
 import novaclient.client
 import novaclient.extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 import novaclient.v1_1.client
 
 

novaclient/tests/unit/test_discover.py

@@ -20,7 +20,7 @@ import mock
 import pkg_resources
 
 import novaclient.shell
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 
 
 class DiscoverTest(utils.TestCase):

novaclient/tests/unit/test_http.py

@@ -17,7 +17,7 @@ import six
 
 from novaclient import client
 from novaclient import exceptions
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 
 
 fake_response = utils.TestResponse({

novaclient/tests/unit/test_service_catalog.py

@@ -15,7 +15,7 @@ from keystoneclient import fixture
 
 from novaclient import exceptions
 from novaclient import service_catalog
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 
 
 SERVICE_CATALOG = fixture.V2Token()

novaclient/tests/unit/test_shell.py

@@ -26,7 +26,7 @@ from testtools import matchers
 import novaclient.client
 from novaclient import exceptions
 import novaclient.shell
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 
 FAKE_ENV = {'OS_USERNAME': 'username',
             'OS_PASSWORD': 'password',

novaclient/tests/unit/test_utils.py

@@ -18,7 +18,7 @@ import six
 
 from novaclient import base
 from novaclient import exceptions
-from novaclient.tests import utils as test_utils
+from novaclient.tests.unit import utils as test_utils
 from novaclient import utils
 
 UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0'

novaclient/tests/unit/v1_1/contrib/fakes.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1 import client
 
 

novaclient/tests/unit/v1_1/contrib/test_assisted_volume_snapshots.py

@@ -17,8 +17,8 @@ Assisted volume snapshots - to be used by Cinder and not end users.
 """
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1.contrib import fakes
+from novaclient.tests.unit.v1_1.contrib import fakes
 from novaclient.v1_1.contrib import assisted_volume_snapshots as assisted_snaps
 
 

novaclient/tests/unit/v1_1/contrib/test_baremetal.py

@@ -15,8 +15,8 @@
 
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1.contrib import fakes
+from novaclient.tests.unit.v1_1.contrib import fakes
 from novaclient.v1_1.contrib import baremetal
 
 

novaclient/tests/unit/v1_1/contrib/test_cells.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1.contrib import fakes
+from novaclient.tests.unit.v1_1.contrib import fakes
 from novaclient.v1_1.contrib import cells
 
 

novaclient/tests/unit/v1_1/contrib/test_instance_actions.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1.contrib import fakes
+from novaclient.tests.unit.v1_1.contrib import fakes
 from novaclient.v1_1.contrib import instance_action
 
 

novaclient/tests/unit/v1_1/contrib/test_list_extensions.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1.contrib import list_extensions
 
 

novaclient/tests/unit/v1_1/contrib/test_migrations.py

@@ -11,8 +11,8 @@
 #    under the License.
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1.contrib import migrations
 
 extensions = [

novaclient/tests/unit/v1_1/contrib/test_server_external_events.py

@@ -17,8 +17,8 @@ External event triggering for servers, not to be used by users.
 """
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1.contrib import fakes
+from novaclient.tests.unit.v1_1.contrib import fakes
 from novaclient.v1_1.contrib import server_external_events as ext_events
 
 

novaclient/tests/unit/v1_1/contrib/test_tenant_networks.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from novaclient import extension
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1.contrib import fakes
+from novaclient.tests.unit.v1_1.contrib import fakes
 from novaclient.v1_1.contrib import tenant_networks
 
 

novaclient/tests/unit/v1_1/fakes.py

@@ -22,8 +22,8 @@ from six.moves.urllib import parse
 
 from novaclient import client as base_client
 from novaclient import exceptions
-from novaclient.tests import fakes
+from novaclient.tests.unit import fakes
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import client
 
 
@@ -515,7 +515,7 @@ class FakeHTTPClient(base_client.HTTPClient):
     #
     # Clear password: FooBar123
     #
-    # RSA Private Key: novaclient/tests/idfake.pem
+    # RSA Private Key: novaclient/tests/unit/idfake.pem
     #
     # Encrypted password
     # OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r

novaclient/tests/unit/v1_1/test_agents.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import agents as data
+from novaclient.tests.unit.fixture_data import agents as data
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import agents
 
 

novaclient/tests/unit/v1_1/test_aggregates.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import aggregates as data
+from novaclient.tests.unit.fixture_data import aggregates as data
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import aggregates
 
 

novaclient/tests/unit/v1_1/test_auth.py

@@ -19,7 +19,7 @@ import mock
 import requests
 
 from novaclient import exceptions
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import client
 
 

novaclient/tests/unit/v1_1/test_availability_zone.py

@@ -16,9 +16,9 @@
 
 import six
 
-from novaclient.tests.fixture_data import availability_zones as data
+from novaclient.tests.unit.fixture_data import availability_zones as data
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import availability_zones
 
 

novaclient/tests/unit/v1_1/test_certs.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import certs as data
+from novaclient.tests.unit.fixture_data import certs as data
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import certs
 
 

novaclient/tests/unit/v1_1/test_client.py

@@ -14,7 +14,7 @@ import uuid
 
 from keystoneclient import session
 
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import client
 
 

novaclient/tests/unit/v1_1/test_cloudpipe.py

@@ -13,9 +13,9 @@
 
 import six
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import cloudpipe as data
+from novaclient.tests.unit.fixture_data import cloudpipe as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import cloudpipe
 
 

novaclient/tests/unit/v1_1/test_fixed_ips.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import fixedips as data
+from novaclient.tests.unit.fixture_data import fixedips as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 
 
 class FixedIpsTest(utils.FixturedTestCase):

novaclient/tests/unit/v1_1/test_flavor_access.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1 import flavor_access
 
 

novaclient/tests/unit/v1_1/test_flavors.py

@@ -16,8 +16,8 @@
 import mock
 
 from novaclient import exceptions
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1 import flavors
 
 

novaclient/tests/unit/v1_1/test_floating_ip_dns.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import floatingips as data
+from novaclient.tests.unit.fixture_data import floatingips as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import floating_ip_dns
 
 

novaclient/tests/unit/v1_1/test_floating_ip_pools.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import floatingips as data
+from novaclient.tests.unit.fixture_data import floatingips as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import floating_ip_pools
 
 

novaclient/tests/unit/v1_1/test_floating_ips.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import floatingips as data
+from novaclient.tests.unit.fixture_data import floatingips as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import floating_ips
 
 

novaclient/tests/unit/v1_1/test_floating_ips_bulk.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import floatingips as data
+from novaclient.tests.unit.fixture_data import floatingips as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import floating_ips_bulk
 
 

novaclient/tests/unit/v1_1/test_fping.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import fping as data
+from novaclient.tests.unit.fixture_data import fping as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import fping
 
 

novaclient/tests/unit/v1_1/test_hosts.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import hosts as data
+from novaclient.tests.unit.fixture_data import hosts as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import hosts
 
 

novaclient/tests/unit/v1_1/test_hypervisors.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import hypervisors as data
+from novaclient.tests.unit.fixture_data import hypervisors as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 
 
 class HypervisorsTest(utils.FixturedTestCase):

novaclient/tests/unit/v1_1/test_images.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import images as data
+from novaclient.tests.unit.fixture_data import images as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import images
 
 

novaclient/tests/unit/v1_1/test_keypairs.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import keypairs as data
+from novaclient.tests.unit.fixture_data import keypairs as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import keypairs
 
 

novaclient/tests/unit/v1_1/test_limits.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import limits as data
+from novaclient.tests.unit.fixture_data import limits as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import limits
 
 

novaclient/tests/unit/v1_1/test_networks.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import networks as data
+from novaclient.tests.unit.fixture_data import networks as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import networks
 
 

novaclient/tests/unit/v1_1/test_quota_classes.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 
 
 cs = fakes.FakeClient()

novaclient/tests/unit/v1_1/test_quotas.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import quotas as data
+from novaclient.tests.unit.fixture_data import quotas as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 
 
 class QuotaSetsTest(utils.FixturedTestCase):

novaclient/tests/unit/v1_1/test_security_group_rules.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 from novaclient import exceptions
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import security_group_rules as data
+from novaclient.tests.unit.fixture_data import security_group_rules as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import security_group_rules
 
 

novaclient/tests/unit/v1_1/test_security_groups.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import security_groups as data
+from novaclient.tests.unit.fixture_data import security_groups as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import security_groups
 
 

novaclient/tests/unit/v1_1/test_server_groups.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import server_groups as data
+from novaclient.tests.unit.fixture_data import server_groups as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import server_groups
 
 

novaclient/tests/unit/v1_1/test_servers.py

@@ -17,10 +17,10 @@ from oslo.serialization import jsonutils
 import six
 
 from novaclient import exceptions
-from novaclient.tests.fixture_data import client
+from novaclient.tests.unit.fixture_data import client
-from novaclient.tests.fixture_data import floatingips
+from novaclient.tests.unit.fixture_data import floatingips
-from novaclient.tests.fixture_data import servers as data
+from novaclient.tests.unit.fixture_data import servers as data
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
 from novaclient.v1_1 import servers
 
 
@@ -525,7 +525,7 @@ class ServersTest(utils.FixturedTestCase):
     #
     # Clear password: FooBar123
     #
-    # RSA Private Key: novaclient/tests/idfake.pem
+    # RSA Private Key: novaclient/tests/unit/idfake.pem
     #
     # Encrypted password
     # OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r
@@ -538,7 +538,7 @@ class ServersTest(utils.FixturedTestCase):
     def test_get_password(self):
         s = self.cs.servers.get(1234)
         self.assertEqual(b'FooBar123',
-                         s.get_password('novaclient/tests/idfake.pem'))
+                         s.get_password('novaclient/tests/unit/idfake.pem'))
         self.assert_called('GET', '/servers/1234/os-server-password')
 
     def test_get_password_without_key(self):

novaclient/tests/unit/v1_1/test_services.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1 import services
 
 

novaclient/tests/unit/v1_1/test_shell.py

@@ -29,8 +29,8 @@ from six.moves import builtins
 import novaclient.client
 from novaclient import exceptions
 import novaclient.shell
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 import novaclient.v1_1.shell
 
 

novaclient/tests/unit/v1_1/test_usage.py

@@ -13,8 +13,8 @@
 
 import datetime
 
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1 import usage
 
 

novaclient/tests/unit/v1_1/test_volumes.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests import utils
+from novaclient.tests.unit import utils
-from novaclient.tests.v1_1 import fakes
+from novaclient.tests.unit.v1_1 import fakes
 from novaclient.v1_1 import volumes