Merge "Flatten service clients and tests directories"

trove_tempest_plugin/services/database/__init__.py

@@ -0,0 +1,26 @@
+# Copyright 2018 Samsung Electronics
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from trove_tempest_plugin.services.database.flavors_client import FlavorsClient
+from trove_tempest_plugin.services.database.limits_client import LimitsClient
+from trove_tempest_plugin.services.database.versions_client import (
+    VersionsClient)
+
+
+__all__ = [
+    'FlavorsClient',
+    'LimitsClient',
+    'VersionsClient'
+]

trove_tempest_plugin/services/database/flavors_client.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove_tempest_plugin.services.database.json import base_client
+from trove_tempest_plugin.services.database import base_client
 
 
 class FlavorsClient(base_client.BaseClient):

trove_tempest_plugin/services/database/limits_client.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove_tempest_plugin.services.database.json import base_client
+from trove_tempest_plugin.services.database import base_client
 
 
 class LimitsClient(base_client.BaseClient):

trove_tempest_plugin/services/database/versions_client.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove_tempest_plugin.services.database.json import base_client
+from trove_tempest_plugin.services.database import base_client
 
 
 class VersionsClient(base_client.BaseClient):

trove_tempest_plugin/tests/api/base.py

@@ -16,9 +16,9 @@
 from tempest import config
 import tempest.test
 
-from trove_tempest_plugin.services.database.json import flavors_client
-from trove_tempest_plugin.services.database.json import limits_client
-from trove_tempest_plugin.services.database.json import versions_client
+from trove_tempest_plugin.services.database import FlavorsClient
+from trove_tempest_plugin.services.database import LimitsClient
+from trove_tempest_plugin.services.database import VersionsClient
 
 
 CONF = config.CONF
@@ -48,18 +48,18 @@ class BaseDatabaseTest(tempest.test.BaseTestCase):
             'build_timeout': CONF.compute.build_timeout
         }
         default_params_with_timeout_values.update(default_params)
-        cls.database_flavors_client = flavors_client.FlavorsClient(
+        cls.database_flavors_client = FlavorsClient(
             cls.os_primary.auth_provider,
             CONF.database.catalog_type,
             CONF.identity.region,
             **default_params_with_timeout_values)
         cls.os_flavors_client = cls.os_primary.flavors_client
-        cls.database_limits_client = limits_client.LimitsClient(
+        cls.database_limits_client = LimitsClient(
             cls.os_primary.auth_provider,
             CONF.database.catalog_type,
             CONF.identity.region,
             **default_params_with_timeout_values)
-        cls.database_versions_client = versions_client.VersionsClient(
+        cls.database_versions_client = VersionsClient(
             cls.os_primary.auth_provider,
             CONF.database.catalog_type,
             CONF.identity.region,

trove_tempest_plugin/tests/api/test_flavors.py

@@ -17,7 +17,7 @@ from tempest.common import utils
 from tempest.lib import decorators
 from testtools import testcase as testtools
 
-from trove_tempest_plugin.tests.api.database import base
+from trove_tempest_plugin.tests.api import base
 
 
 class DatabaseFlavorsTest(base.BaseDatabaseTest):

trove_tempest_plugin/tests/api/test_flavors_negative.py

@@ -18,7 +18,7 @@ from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 from testtools import testcase as testtools
 
-from trove_tempest_plugin.tests.api.database import base
+from trove_tempest_plugin.tests.api import base
 
 
 class DatabaseFlavorsNegativeTest(base.BaseDatabaseTest):

trove_tempest_plugin/tests/api/test_limits.py

@@ -16,7 +16,7 @@
 from tempest.lib import decorators
 from testtools import testcase as testtools
 
-from trove_tempest_plugin.tests.api.database import base
+from trove_tempest_plugin.tests.api import base
 
 
 class DatabaseLimitsTest(base.BaseDatabaseTest):

trove_tempest_plugin/tests/api/test_versions.py

@@ -16,7 +16,7 @@
 from tempest.lib import decorators
 from testtools import testcase as testtools
 
-from trove_tempest_plugin.tests.api.database import base
+from trove_tempest_plugin.tests.api import base
 
 
 class DatabaseVersionsTest(base.BaseDatabaseTest):