diff --git a/functional/common/test.py b/functional/common/test.py index 9887c7657..436156151 100644 --- a/functional/common/test.py +++ b/functional/common/test.py @@ -17,8 +17,8 @@ import subprocess import testtools import six -from tempest_lib.cli import output_parser -from tempest_lib import exceptions +from tempest.lib.cli import output_parser +from tempest.lib import exceptions COMMON_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/functional/tests/compute/v2/test_keypair.py b/functional/tests/compute/v2/test_keypair.py index 80cd4b464..6bc5cdb7c 100644 --- a/functional/tests/compute/v2/test_keypair.py +++ b/functional/tests/compute/v2/test_keypair.py @@ -14,8 +14,8 @@ import tempfile from functional.common import test -from tempest_lib.common.utils import data_utils -from tempest_lib import exceptions +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions class KeypairBase(test.TestCase): diff --git a/functional/tests/compute/v2/test_server.py b/functional/tests/compute/v2/test_server.py index 198bd56b2..4309aeaa5 100644 --- a/functional/tests/compute/v2/test_server.py +++ b/functional/tests/compute/v2/test_server.py @@ -12,11 +12,11 @@ import time -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from functional.common import test -from tempest_lib import exceptions +from tempest.lib import exceptions class ServerTests(test.TestCase): diff --git a/functional/tests/identity/v2/test_identity.py b/functional/tests/identity/v2/test_identity.py index 4346499ce..9adbe49f4 100644 --- a/functional/tests/identity/v2/test_identity.py +++ b/functional/tests/identity/v2/test_identity.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.common import test diff --git a/functional/tests/identity/v2/test_project.py b/functional/tests/identity/v2/test_project.py index 3a5e8e81a..e9580ecfb 100644 --- a/functional/tests/identity/v2/test_project.py +++ b/functional/tests/identity/v2/test_project.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.tests.identity.v2 import test_identity diff --git a/functional/tests/identity/v2/test_user.py b/functional/tests/identity/v2/test_user.py index a0c1a46b8..34cabf7bf 100644 --- a/functional/tests/identity/v2/test_user.py +++ b/functional/tests/identity/v2/test_user.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils -from tempest_lib import exceptions +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions from functional.tests.identity.v2 import test_identity diff --git a/functional/tests/identity/v3/test_domain.py b/functional/tests/identity/v3/test_domain.py index 221efd6a2..0708e4200 100644 --- a/functional/tests/identity/v3/test_domain.py +++ b/functional/tests/identity/v3/test_domain.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils -from tempest_lib import exceptions +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions from functional.tests.identity.v3 import test_identity diff --git a/functional/tests/identity/v3/test_endpoint.py b/functional/tests/identity/v3/test_endpoint.py index e68aa848d..ec11deab3 100644 --- a/functional/tests/identity/v3/test_endpoint.py +++ b/functional/tests/identity/v3/test_endpoint.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.tests.identity.v3 import test_identity diff --git a/functional/tests/identity/v3/test_group.py b/functional/tests/identity/v3/test_group.py index 156a9ff1e..3f58864dc 100644 --- a/functional/tests/identity/v3/test_group.py +++ b/functional/tests/identity/v3/test_group.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.tests.identity.v3 import test_identity diff --git a/functional/tests/identity/v3/test_identity.py b/functional/tests/identity/v3/test_identity.py index b8c652abc..3f9887428 100644 --- a/functional/tests/identity/v3/test_identity.py +++ b/functional/tests/identity/v3/test_identity.py @@ -12,7 +12,7 @@ import os -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.common import test diff --git a/functional/tests/identity/v3/test_idp.py b/functional/tests/identity/v3/test_idp.py index 3d6739d7f..08f660f66 100644 --- a/functional/tests/identity/v3/test_idp.py +++ b/functional/tests/identity/v3/test_idp.py @@ -11,7 +11,7 @@ # under the License. from functional.tests.identity.v3 import test_identity -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils class IdentityProviderTests(test_identity.IdentityTests): diff --git a/functional/tests/identity/v3/test_project.py b/functional/tests/identity/v3/test_project.py index 6c278691f..d060c7b1a 100644 --- a/functional/tests/identity/v3/test_project.py +++ b/functional/tests/identity/v3/test_project.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.tests.identity.v3 import test_identity diff --git a/functional/tests/identity/v3/test_role.py b/functional/tests/identity/v3/test_role.py index 5f150b052..29dc4b200 100644 --- a/functional/tests/identity/v3/test_role.py +++ b/functional/tests/identity/v3/test_role.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.tests.identity.v3 import test_identity diff --git a/functional/tests/identity/v3/test_service.py b/functional/tests/identity/v3/test_service.py index 147208a2b..684fa5fea 100644 --- a/functional/tests/identity/v3/test_service.py +++ b/functional/tests/identity/v3/test_service.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.tests.identity.v3 import test_identity diff --git a/functional/tests/identity/v3/test_service_provider.py b/functional/tests/identity/v3/test_service_provider.py index eed9fccb7..936c6620d 100644 --- a/functional/tests/identity/v3/test_service_provider.py +++ b/functional/tests/identity/v3/test_service_provider.py @@ -11,7 +11,7 @@ # under the License. from functional.tests.identity.v3 import test_identity -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils class ServiceProviderTests(test_identity.IdentityTests): diff --git a/functional/tests/identity/v3/test_user.py b/functional/tests/identity/v3/test_user.py index 00b9bdc2f..cc3e08a0b 100644 --- a/functional/tests/identity/v3/test_user.py +++ b/functional/tests/identity/v3/test_user.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from functional.tests.identity.v3 import test_identity diff --git a/test-requirements.txt b/test-requirements.txt index 5694550a8..f39b86bb6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,7 +15,7 @@ sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD os-testr>=0.4.1 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT -tempest-lib>=0.14.0 # Apache-2.0 +tempest>=11.0.0 # Apache-2.0 osprofiler>=1.3.0 # Apache-2.0 # Install these to generate sphinx autodocs