rename tests -> api

Now that all the other tests are moved out of the tests directory
we can rename tests -> api to reflect that these tests are api
testing, and need to use only the internal clients.

Clean up references from other parts of OpenStack to the new api
namespace.

Reorder the imports as required with this naming change.

Added README.rst

Change-Id: I19203957f917b59e7c8a3838c590937752461a2f

tempest/api/README.rst

@@ -0,0 +1,50 @@
+Tempest Guide to API tests
+========
+
+
+What are these tests?
+--------
+
+One of Tempest's prime function is to ensure that your OpenStack cloud
+works with the OpenStack API as documented. The current largest
+portion of Tempest code is devoted to test cases that do exactly this.
+
+It's also important to test not only the expected possitive path on
+APIs, but also to provide them with invalid data to ensure they fail
+in expected and documented ways. Over the course of the OpenStack
+project Tempest has discovered many fundamental bugs by doing just
+this.
+
+In order for some APIs to return meaniful results, there must be
+enough data in the system. This means these tests might start by
+spinning up a server, image, etc, then opperating on it.
+
+
+Why are these tests in tempest?
+--------
+
+This is one of the core missions for the Tempest project, and where it
+started. Many people use this bit of function in Tempest to ensure
+their clouds haven't broken the OpenStack API.
+
+It could be argued that some of the negative testing could be done
+back in the projects themselves, and we might evolve there over time,
+but currently in the OpenStack gate this is a fundamentally important
+place to keep things.
+
+
+Scope of these tests
+--------
+
+API tests should always use the Tempest implementation of the
+OpenStack API, as we want to ensure that bugs aren't hidden by the
+official clients.
+
+They should test specific API calls, and can build up complex state if
+it's needed for the API call to be meaningful.
+
+They should send not only good data, but bad data at the API and look
+for error codes.
+
+They should all be able to be run on their own, not depending on the
+state created by a previous test.

tempest/api/compute/__init__.py

@@ -36,7 +36,7 @@ MULTI_USER = True
 
 # All compute tests -- single setup function
 def generic_setup_package():
-    LOG.debug("Entering tempest.tests.compute.setup_package")
+    LOG.debug("Entering tempest.api.compute.setup_package")
 
     global MULTI_USER, DISK_CONFIG_ENABLED, FLAVOR_EXTRA_DATA_ENABLED
     os = clients.Manager()

tempest/api/compute/admin/test_aggregates.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class AggregatesAdminTestJSON(base.BaseComputeAdminTest):

tempest/api/compute/admin/test_availability_zone.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class AvailabilityZoneAdminTestJSON(base.BaseComputeAdminTest):

tempest/api/compute/admin/test_fixed_ips.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class FixedIPsBase(base.BaseComputeAdminTest):

tempest/api/compute/admin/test_flavors.py

@@ -15,12 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_int_id
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class FlavorsAdminTestJSON(base.BaseComputeAdminTest):

tempest/api/compute/admin/test_flavors_access.py

@@ -15,12 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_int_id
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class FlavorsAccessTestJSON(base.BaseComputeAdminTest):

tempest/api/compute/admin/test_flavors_extra_specs.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class FlavorsExtraSpecsTestJSON(base.BaseComputeAdminTest):

tempest/api/compute/admin/test_quotas.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class QuotasAdminTestJSON(base.BaseComputeAdminTest):

tempest/api/compute/admin/test_services.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ServicesAdminTestJSON(base.BaseComputeAdminTest):

tempest/api/compute/base.py

@@ -18,11 +18,11 @@
 import logging
 import time
 
+from tempest.api import compute
 from tempest import clients
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 import tempest.test
-from tempest.tests import compute
 
 
 LOG = logging.getLogger(__name__)

tempest/api/compute/flavors/test_flavors.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class FlavorsTestJSON(base.BaseComputeTest):

tempest/api/compute/floating_ips/test_floating_ips_actions.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class FloatingIPsTestJSON(base.BaseComputeTest):

tempest/api/compute/floating_ips/test_list_floating_ips.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class FloatingIPDetailsTestJSON(base.BaseComputeTest):

tempest/api/compute/images/test_image_metadata.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ImagesMetadataTestJSON(base.BaseComputeTest):

tempest/api/compute/images/test_images.py

@@ -17,13 +17,13 @@
 
 import testtools
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest import clients
 from tempest.common.utils.data_utils import parse_image_id
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class ImagesTestJSON(base.BaseComputeTest):

tempest/api/compute/images/test_images_oneserver.py

@@ -17,13 +17,13 @@
 
 import testtools
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest import clients
 from tempest.common.utils.data_utils import parse_image_id
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class ImagesOneServerTestJSON(base.BaseComputeTest):

tempest/api/compute/images/test_list_image_filters.py

@@ -15,11 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import parse_image_id
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ListImageFiltersTestJSON(base.BaseComputeTest):

tempest/api/compute/images/test_list_images.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ListImagesTestJSON(base.BaseComputeTest):

tempest/api/compute/keypairs/test_keypairs.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class KeyPairsTestJSON(base.BaseComputeTest):

tempest/api/compute/limits/test_absolute_limits.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class AbsoluteLimitsTestJSON(base.BaseComputeTest):

tempest/api/compute/security_groups/test_security_group_rules.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class SecurityGroupRulesTestJSON(base.BaseComputeTest):

tempest/api/compute/security_groups/test_security_groups.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class SecurityGroupsTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_attach_interfaces.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest.tests.compute import base
+from tempest.api.compute import base
 
 import time
 

tempest/api/compute/servers/test_create_server.py

@@ -20,13 +20,12 @@ import base64
 import netaddr
 import testtools
 
-
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.common.utils.linux.remote_client import RemoteClient
 import tempest.config
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 @attr(type='smoke')

tempest/api/compute/servers/test_disk_config.py

@@ -17,9 +17,9 @@
 
 import testtools
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class ServerDiskConfigTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_instance_actions.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class InstanceActionsTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_list_server_filters.py

@@ -15,14 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import testtools
 
+from tempest.api.compute import base
+from tempest.api import utils
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
-from tempest.tests import utils
-
-import testtools
 
 
 class ListServerFiltersTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_list_servers_negative.py

@@ -16,10 +16,10 @@
 #    under the License.
 
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest import clients
 from tempest import exceptions
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class ListServersNegativeTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_multiple_create.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class MultipleCreateTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_server_actions.py

@@ -20,13 +20,13 @@ import time
 
 import testtools
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.common.utils.linux.remote_client import RemoteClient
 import tempest.config
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class ServerActionsTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_server_addresses.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ServerAddressesTest(base.BaseComputeTest):

tempest/api/compute/servers/test_server_metadata.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ServerMetadataTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_server_personality.py

@@ -17,9 +17,9 @@
 
 import base64
 
+from tempest.api.compute import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ServerPersonalityTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_server_rescue.py

@@ -15,11 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 import tempest.config
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ServerRescueTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_servers.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ServersTestJSON(base.BaseComputeTest):

tempest/api/compute/servers/test_servers_negative.py

@@ -17,11 +17,11 @@
 
 import sys
 
+from tempest.api.compute import base
 from tempest import clients
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ServersNegativeTest(base.BaseComputeTest):

tempest/api/compute/servers/test_virtual_interfaces.py

@@ -17,10 +17,10 @@
 
 import netaddr
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 @attr(type='smoke')

tempest/api/compute/test_authorization.py

@@ -15,12 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api import compute
+from tempest.api.compute import base
 from tempest import clients
 from tempest.common.utils.data_utils import parse_image_id
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
-from tempest.tests import compute
-from tempest.tests.compute import base
 
 
 class AuthorizationTestJSON(base.BaseComputeTest):

tempest/api/compute/test_extensions.py

@@ -16,8 +16,8 @@
 #    under the License.
 
 
+from tempest.api.compute import base
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class ExtensionsTestJSON(base.BaseComputeTest):

tempest/api/compute/test_live_block_migration.py

@@ -20,10 +20,10 @@ import string
 
 import testtools
 
+from tempest.api.compute import base
 from tempest import config
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 @attr(category='live-migration')

tempest/api/compute/test_quotas.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class QuotasTestJSON(base.BaseComputeTest):

tempest/api/compute/volumes/test_attach_volume.py

@@ -17,10 +17,10 @@
 
 import testtools
 
+from tempest.api.compute import base
 from tempest.common.utils.linux.remote_client import RemoteClient
 import tempest.config
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class AttachVolumeTestJSON(base.BaseComputeTest):

tempest/api/compute/volumes/test_volumes_get.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.compute import base
 
 
 class VolumesGetTestJSON(base.BaseComputeTest):

tempest/api/compute/volumes/test_volumes_list.py

@@ -15,9 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
-from tempest.tests.compute import base
 
 
 class VolumesTestJSON(base.BaseComputeTest):

tempest/api/compute/volumes/test_volumes_negative.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.compute import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
-from tempest.tests.compute import base
 
 
 class VolumesNegativeTest(base.BaseComputeTest):

tempest/api/identity/__init__.py

@@ -22,4 +22,4 @@ LOG = logging.getLogger(__name__)
 
 # All identity tests -- single setup function
 def setup_package():
-    LOG.debug("Entering tempest.tests.identity.setup_package")
+    LOG.debug("Entering tempest.api.identity.setup_package")

tempest/api/identity/admin/test_roles.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.identity import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.identity import base
 
 
 class RolesTestJSON(base.BaseIdentityAdminTest):

tempest/api/identity/admin/test_services.py

@@ -16,10 +16,10 @@
 #    under the License.
 
 
+from tempest.api.identity import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.identity import base
 
 
 class ServicesTestJSON(base.BaseIdentityAdminTest):

tempest/api/identity/admin/test_tenants.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.identity import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.identity import base
 
 
 class TenantsTestJSON(base.BaseIdentityAdminTest):

tempest/api/identity/admin/test_users.py

@@ -15,12 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import testtools
+from testtools.matchers._basic import Contains
+
+from tempest.api.identity import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.identity import base
-import testtools
-from testtools.matchers._basic import Contains
 
 
 class UsersTestJSON(base.BaseIdentityAdminTest):

tempest/api/identity/admin/v3/test_endpoints.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.identity import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.identity import base
 
 
 class EndPointsTestJSON(base.BaseIdentityAdminTest):

tempest/api/identity/admin/v3/test_services.py

@@ -16,9 +16,9 @@
 #    under the License.
 
 
+from tempest.api.identity import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.identity import base
 
 
 class ServicesTestJSON(base.BaseIdentityAdminTest):

tempest/api/identity/admin/v3/test_users.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.identity import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.identity import base
 
 
 class UsersV3TestJSON(base.BaseIdentityAdminTest):

tempest/api/image/v1/test_image_members.py

@@ -16,9 +16,9 @@
 
 import cStringIO as StringIO
 
+from tempest.api.image import base
 from tempest import clients
 from tempest.test import attr
-from tempest.tests.image import base
 
 
 class ImageMembersTests(base.BaseV1ImageTest):

tempest/api/image/v1/test_images.py

@@ -17,9 +17,9 @@
 
 import cStringIO as StringIO
 
+from tempest.api.image import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.image import base
 
 
 class CreateRegisterImagesTest(base.BaseV1ImageTest):

tempest/api/image/v2/test_images.py

@@ -19,9 +19,9 @@
 import cStringIO as StringIO
 import random
 
+from tempest.api.image import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.image import base
 
 
 class CreateRegisterImagesTest(base.BaseV2ImageTest):

tempest/api/network/test_networks.py

@@ -17,10 +17,10 @@
 
 import netaddr
 
+from tempest.api.network import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.network import base
 
 
 class NetworksTest(base.BaseNetworkTest):

tempest/api/object_storage/base.py

@@ -16,10 +16,10 @@
 #    under the License.
 
 
+from tempest.api.identity.base import DataGenerator
 from tempest import clients
 from tempest import exceptions
 import tempest.test
-from tempest.tests.identity.base import DataGenerator
 
 
 class BaseObjectTest(tempest.test.BaseTestCase):

tempest/api/object_storage/test_account_services.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.object_storage import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.object_storage import base
 
 
 class AccountTest(base.BaseObjectTest):

tempest/api/object_storage/test_container_services.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.object_storage import base
 from tempest.common.utils.data_utils import arbitrary_string
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.object_storage import base
 
 
 class ContainerTest(base.BaseObjectTest):

tempest/api/object_storage/test_container_sync.py

@@ -15,11 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import time
+
+import testtools
+
+from tempest.api.object_storage import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.object_storage import base
-import testtools
-import time
 
 
 class ContainerSyncTest(base.BaseObjectTest):

tempest/api/object_storage/test_object_expiry.py

@@ -15,13 +15,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import time
+
+import testtools
+
+from tempest.api.object_storage import base
 from tempest.common.utils.data_utils import arbitrary_string
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.object_storage import base
-import testtools
-import time
 
 
 class ObjectExpiryTest(base.BaseObjectTest):

tempest/api/object_storage/test_object_services.py

@@ -15,13 +15,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import time
+
+import testtools
+
+from tempest.api.object_storage import base
 from tempest.common.utils.data_utils import arbitrary_string
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.object_storage import base
-import testtools
-import time
 
 
 class ObjectTest(base.BaseObjectTest):

tempest/api/object_storage/test_object_version.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.object_storage import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.object_storage import base
 
 
 class ContainerTest(base.BaseObjectTest):

tempest/api/volume/admin/test_multi_backend.py

@@ -18,12 +18,12 @@
 import logging
 import testtools
 
+from tempest.api.volume import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import config
 from tempest.services.volume.json.admin import volume_types_client
 from tempest.services.volume.json import volumes_client
 from tempest.test import attr
-from tempest.tests.volume import base
 
 LOG = logging.getLogger(__name__)
 

tempest/api/volume/admin/test_volume_types.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.volume.base import BaseVolumeTest
 from tempest.common.utils.data_utils import rand_name
 from tempest.services.volume.json.admin import volume_types_client
 from tempest.test import attr
-from tempest.tests.volume.base import BaseVolumeTest
 
 
 class VolumeTypesTest(BaseVolumeTest):

tempest/api/volume/admin/test_volume_types_extra_specs.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.volume import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.volume import base
 
 
 class VolumeTypesExtraSpecsTest(base.BaseVolumeAdminTest):

tempest/api/volume/admin/test_volume_types_extra_specs_negative.py

@@ -17,10 +17,10 @@
 
 import uuid
 
+from tempest.api.volume import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.volume import base
 
 
 class ExtraSpecsNegativeTest(base.BaseVolumeAdminTest):

tempest/api/volume/admin/test_volume_types_negative.py

@@ -17,9 +17,9 @@
 
 import uuid
 
+from tempest.api.volume import base
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.volume import base
 
 
 class VolumeTypesNegativeTest(base.BaseVolumeAdminTest):

tempest/api/volume/test_volumes_actions.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.volume.base import BaseVolumeTest
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.volume.base import BaseVolumeTest
 
 
 class VolumesActionsTest(BaseVolumeTest):

tempest/api/volume/test_volumes_get.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.volume import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.volume import base
 
 
 class VolumesGetTest(base.BaseVolumeTest):

tempest/api/volume/test_volumes_list.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.volume import base
 from tempest.common.utils.data_utils import rand_name
 from tempest.test import attr
-from tempest.tests.volume import base
 
 
 class VolumesListTest(base.BaseVolumeTest):

tempest/api/volume/test_volumes_negative.py

@@ -15,10 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.api.volume import base
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
 from tempest.test import attr
-from tempest.tests.volume import base
 
 
 class VolumesNegativeTest(base.BaseVolumeTest):

tempest/api/volume/test_volumes_snapshots.py

@@ -14,8 +14,8 @@
 
 import logging
 
+from tempest.api.volume import base
 from tempest.test import attr
-from tempest.tests.volume import base
 
 LOG = logging.getLogger(__name__)