Move unit tests into test directory

This is the first step of moving functional testing
into the project tree.  This change just moves
all of the unit tests to be under a dedicated tests/unit
directory.

Follow up patches will add the functional directory and
start moving tempest CLI tests there.

Change-Id: I9dc0b8f761676c1b3bbdeb03e2f44b35f75c693e

cinderclient/tests/unit/fixture_data/availability_zones.py

@@ -11,7 +11,7 @@
 # under the License.
 
 from datetime import datetime
-from cinderclient.tests.fixture_data import base
+from cinderclient.tests.unit.fixture_data import base
 
 # FIXME(jamielennox): use timeutils from oslo
 FORMAT = '%Y-%m-%d %H:%M:%S'

cinderclient/tests/unit/fixture_data/client.py

@@ -12,7 +12,7 @@
 
 from keystoneclient import fixture
 
-from cinderclient.tests.fixture_data import base
+from cinderclient.tests.unit.fixture_data import base
 from cinderclient.v1 import client as v1client
 from cinderclient.v2 import client as v2client
 

cinderclient/tests/unit/fixture_data/snapshots.py

@@ -12,7 +12,7 @@
 
 import json
 
-from cinderclient.tests.fixture_data import base
+from cinderclient.tests.unit.fixture_data import base
 
 
 def _stub_snapshot(**kwargs):

cinderclient/tests/unit/test_auth_plugins.py

@@ -25,7 +25,7 @@ except ImportError:
 
 from cinderclient import auth_plugin
 from cinderclient import exceptions
-from cinderclient.tests import utils
+from cinderclient.tests.unit import utils
 from cinderclient.v1 import client
 
 

cinderclient/tests/unit/test_base.py

@@ -14,8 +14,8 @@
 from cinderclient import base
 from cinderclient import exceptions
 from cinderclient.v1 import volumes
-from cinderclient.tests import utils
-from cinderclient.tests.v1 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v1 import fakes
 
 
 cs = fakes.FakeClient()

cinderclient/tests/unit/test_client.py

@@ -18,7 +18,7 @@ import fixtures
 import cinderclient.client
 import cinderclient.v1.client
 import cinderclient.v2.client
-from cinderclient.tests import utils
+from cinderclient.tests.unit import utils
 
 
 class ClientTest(utils.TestCase):

cinderclient/tests/unit/test_http.py

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

cinderclient/tests/unit/test_service_catalog.py

@@ -13,7 +13,7 @@
 
 from cinderclient import exceptions
 from cinderclient import service_catalog
-from cinderclient.tests import utils
+from cinderclient.tests.unit import utils
 
 
 # Taken directly from keystone/content/common/samples/auth.json

cinderclient/tests/unit/test_shell.py

@@ -23,8 +23,8 @@ from testtools import matchers
 
 from cinderclient import exceptions
 from cinderclient import shell
-from cinderclient.tests import utils
-from cinderclient.tests.fixture_data import keystone_client
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.fixture_data import keystone_client
 import keystoneclient.exceptions as ks_exc
 from keystoneclient.exceptions import DiscoveryFailure
 

cinderclient/tests/unit/test_utils.py

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

cinderclient/tests/unit/v1/contrib/test_list_extensions.py

@@ -14,8 +14,8 @@
 from cinderclient import extension
 from cinderclient.v1.contrib import list_extensions
 
-from cinderclient.tests import utils
-from cinderclient.tests.v1 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v1 import fakes
 
 
 extensions = [

cinderclient/tests/unit/v1/fakes.py

@@ -21,8 +21,8 @@ except ImportError:
     import urllib.parse as urlparse
 
 from cinderclient import client as base_client
-from cinderclient.tests import fakes
-import cinderclient.tests.utils as utils
+from cinderclient.tests.unit import fakes
+import cinderclient.tests.unit.utils as utils
 from cinderclient.v1 import client
 
 

cinderclient/tests/unit/v1/test_auth.py

@@ -18,7 +18,7 @@ import requests
 
 from cinderclient.v1 import client
 from cinderclient import exceptions
-from cinderclient.tests import utils
+from cinderclient.tests.unit import utils
 
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):

cinderclient/tests/unit/v1/test_availability_zone.py

@@ -18,9 +18,9 @@ import six
 
 from cinderclient.v1 import availability_zones
 from cinderclient.v1 import shell
-from cinderclient.tests.fixture_data import client
-from cinderclient.tests.fixture_data import availability_zones as azfixture
-from cinderclient.tests import utils
+from cinderclient.tests.unit.fixture_data import client
+from cinderclient.tests.unit.fixture_data import availability_zones as azfixture  # noqa
+from cinderclient.tests.unit import utils
 
 
 class AvailabilityZoneTest(utils.FixturedTestCase):

cinderclient/tests/unit/v1/test_limits.py

@@ -15,7 +15,7 @@
 
 import mock
 
-from cinderclient.tests import utils
+from cinderclient.tests.unit import utils
 from cinderclient.v1 import limits
 
 

cinderclient/tests/unit/v1/test_qos.py

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

cinderclient/tests/unit/v1/test_quota_classes.py

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

cinderclient/tests/unit/v1/test_quotas.py

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

cinderclient/tests/unit/v1/test_services.py

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

cinderclient/tests/unit/v1/test_shell.py

@@ -22,9 +22,9 @@ from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
 from cinderclient.v1 import shell as shell_v1
-from cinderclient.tests.v1 import fakes
-from cinderclient.tests import utils
-from cinderclient.tests.fixture_data import keystone_client
+from cinderclient.tests.unit.v1 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.fixture_data import keystone_client
 
 
 class ShellTest(utils.TestCase):

cinderclient/tests/unit/v1/test_snapshot_actions.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests import utils
-from cinderclient.tests.fixture_data import client
-from cinderclient.tests.fixture_data import snapshots
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.fixture_data import client
+from cinderclient.tests.unit.fixture_data import snapshots
 
 
 class SnapshotActionsTest(utils.FixturedTestCase):

cinderclient/tests/unit/v1/test_types.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 from cinderclient.v1 import volume_types
-from cinderclient.tests import utils
-from cinderclient.tests.v1 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v1 import fakes
 
 cs = fakes.FakeClient()
 

cinderclient/tests/unit/v1/test_volume_backups.py

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

cinderclient/tests/unit/v1/test_volume_encryption_types.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from cinderclient.v1.volume_encryption_types import VolumeEncryptionType
-from cinderclient.tests import utils
-from cinderclient.tests.v1 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v1 import fakes
 
 cs = fakes.FakeClient()
 

cinderclient/tests/unit/v1/test_volume_transfers.py

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

cinderclient/tests/unit/v1/test_volumes.py

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

cinderclient/tests/unit/v2/contrib/test_list_extensions.py

@@ -16,8 +16,8 @@
 
 from cinderclient import extension
 from cinderclient.v2.contrib import list_extensions
-from cinderclient.tests import utils
-from cinderclient.tests.v1 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v1 import fakes
 
 
 extensions = [

cinderclient/tests/unit/v2/fakes.py

@@ -20,8 +20,8 @@ except ImportError:
     import urllib.parse as urlparse
 
 from cinderclient import client as base_client
-from cinderclient.tests import fakes
-import cinderclient.tests.utils as utils
+from cinderclient.tests.unit import fakes
+import cinderclient.tests.unit.utils as utils
 from cinderclient.v2 import client
 
 

cinderclient/tests/unit/v2/test_auth.py

@@ -21,7 +21,7 @@ import requests
 
 from cinderclient import exceptions
 from cinderclient.v2 import client
-from cinderclient.tests import utils
+from cinderclient.tests.unit import utils
 
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):

cinderclient/tests/unit/v2/test_availability_zone.py

@@ -18,9 +18,9 @@ import six
 
 from cinderclient.v2 import availability_zones
 from cinderclient.v2 import shell
-from cinderclient.tests.fixture_data import client
-from cinderclient.tests.fixture_data import availability_zones as azfixture
-from cinderclient.tests import utils
+from cinderclient.tests.unit.fixture_data import client
+from cinderclient.tests.unit.fixture_data import availability_zones as azfixture  # noqa
+from cinderclient.tests.unit import utils
 
 
 class AvailabilityZoneTest(utils.FixturedTestCase):

cinderclient/tests/unit/v2/test_cgsnapshots.py

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

cinderclient/tests/unit/v2/test_consistencygroups.py

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

cinderclient/tests/unit/v2/test_limits.py

@@ -15,7 +15,7 @@
 
 import mock
 
-from cinderclient.tests import utils
+from cinderclient.tests.unit import utils
 from cinderclient.v2 import limits
 
 

cinderclient/tests/unit/v2/test_pools.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from cinderclient.v2.pools import Pool
-from cinderclient.tests import utils
-from cinderclient.tests.v2 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v2 import fakes
 
 cs = fakes.FakeClient()
 

cinderclient/tests/unit/v2/test_qos.py

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

cinderclient/tests/unit/v2/test_quota_classes.py

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

cinderclient/tests/unit/v2/test_quotas.py

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

cinderclient/tests/unit/v2/test_services.py

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

cinderclient/tests/unit/v2/test_shell.py

@@ -21,9 +21,9 @@ from six.moves.urllib import parse
 from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
-from cinderclient.tests import utils
-from cinderclient.tests.v2 import fakes
-from cinderclient.tests.fixture_data import keystone_client
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v2 import fakes
+from cinderclient.tests.unit.fixture_data import keystone_client
 
 
 class ShellTest(utils.TestCase):

cinderclient/tests/unit/v2/test_snapshot_actions.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests import utils
-from cinderclient.tests.fixture_data import client
-from cinderclient.tests.fixture_data import snapshots
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.fixture_data import client
+from cinderclient.tests.unit.fixture_data import snapshots
 
 
 class SnapshotActionsTest(utils.FixturedTestCase):

cinderclient/tests/unit/v2/test_type_access.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 from cinderclient.v2 import volume_type_access
-from cinderclient.tests import utils
-from cinderclient.tests.v2 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v2 import fakes
 
 cs = fakes.FakeClient()
 

cinderclient/tests/unit/v2/test_types.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 from cinderclient.v2 import volume_types
-from cinderclient.tests import utils
-from cinderclient.tests.v2 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v2 import fakes
 
 cs = fakes.FakeClient()
 

cinderclient/tests/unit/v2/test_volume_backups.py

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

cinderclient/tests/unit/v2/test_volume_encryption_types.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from cinderclient.v2.volume_encryption_types import VolumeEncryptionType
-from cinderclient.tests import utils
-from cinderclient.tests.v2 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v2 import fakes
 
 cs = fakes.FakeClient()
 

cinderclient/tests/unit/v2/test_volume_transfers.py

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

cinderclient/tests/unit/v2/test_volumes.py

@@ -14,8 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests import utils
-from cinderclient.tests.v2 import fakes
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v2 import fakes
 from cinderclient.v2.volumes import Volume
 
 cs = fakes.FakeClient()