diff --git a/novaclient/tests/functional/base.py b/novaclient/tests/functional/base.py index 085ffa6c2..300179f3c 100644 --- a/novaclient/tests/functional/base.py +++ b/novaclient/tests/functional/base.py @@ -21,7 +21,7 @@ from keystoneauth1 import session as ksession from keystoneclient import client as keystoneclient import os_client_config import six -import tempest_lib.cli.base +import tempest.lib.cli.base import testtools import novaclient @@ -196,7 +196,7 @@ class ClientTestBase(testtools.TestCase): self.network = pick_network(self.client.networks.list()) # create a CLI client in case we'd like to do CLI - # testing. tempest_lib does this really weird thing where it + # testing. tempest.lib does this really weird thing where it # builds a giant factory of all the CLIs that it knows # about. Eventually that should really be unwound into # something more sensible. @@ -204,7 +204,7 @@ class ClientTestBase(testtools.TestCase): 'OS_NOVACLIENT_EXEC_DIR', os.path.join(os.path.abspath('.'), '.tox/functional/bin')) - self.cli_clients = tempest_lib.cli.base.CLIClient( + self.cli_clients = tempest.lib.cli.base.CLIClient( username=user, password=passwd, tenant_name=tenant, @@ -404,7 +404,7 @@ class TenantTestBase(ClientTestBase): user_name, password, tenant_id=self.project_id).id self.addCleanup(self.keystone.users.delete, self.user_id) - self.cli_clients_2 = tempest_lib.cli.base.CLIClient( + self.cli_clients_2 = tempest.lib.cli.base.CLIClient( username=user_name, password=password, tenant_name=project_name, diff --git a/novaclient/tests/functional/test_auth.py b/novaclient/tests/functional/test_auth.py index e37fc789e..0ee995b7b 100644 --- a/novaclient/tests/functional/test_auth.py +++ b/novaclient/tests/functional/test_auth.py @@ -11,7 +11,7 @@ # under the License. from six.moves.urllib import parse -import tempest_lib.cli.base +import tempest.lib.cli.base from novaclient.tests.functional import base @@ -32,7 +32,7 @@ class TestAuthentication(base.ClientTestBase): if self.cli_clients.insecure: flags += ' --insecure ' - return tempest_lib.cli.base.execute( + return tempest.lib.cli.base.execute( "nova", action, flags, cli_dir=self.cli_clients.cli_dir) def test_auth_via_keystone_v2(self): diff --git a/novaclient/tests/functional/v2/legacy/test_consoles.py b/novaclient/tests/functional/v2/legacy/test_consoles.py index 318541f9b..5afec203e 100644 --- a/novaclient/tests/functional/v2/legacy/test_consoles.py +++ b/novaclient/tests/functional/v2/legacy/test_consoles.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions +from tempest.lib import exceptions from novaclient.tests.functional import base diff --git a/novaclient/tests/functional/v2/legacy/test_keypairs.py b/novaclient/tests/functional/v2/legacy/test_keypairs.py index 9828df02e..85a1a3a77 100644 --- a/novaclient/tests/functional/v2/legacy/test_keypairs.py +++ b/novaclient/tests/functional/v2/legacy/test_keypairs.py @@ -13,7 +13,7 @@ import tempfile import uuid -from tempest_lib import exceptions +from tempest.lib import exceptions from novaclient.tests.functional import base from novaclient.tests.functional.v2 import fake_crypto diff --git a/novaclient/tests/functional/v2/legacy/test_readonly_nova.py b/novaclient/tests/functional/v2/legacy/test_readonly_nova.py index 7f350199e..d8ac5d0e5 100644 --- a/novaclient/tests/functional/v2/legacy/test_readonly_nova.py +++ b/novaclient/tests/functional/v2/legacy/test_readonly_nova.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import decorators -from tempest_lib import exceptions +from tempest.lib import decorators +from tempest.lib import exceptions from novaclient.tests.functional import base diff --git a/novaclient/tests/functional/v2/test_instance_action.py b/novaclient/tests/functional/v2/test_instance_action.py index a4557277e..db95b9b70 100644 --- a/novaclient/tests/functional/v2/test_instance_action.py +++ b/novaclient/tests/functional/v2/test_instance_action.py @@ -13,7 +13,7 @@ import uuid import six -from tempest_lib import exceptions +from tempest.lib import exceptions from novaclient.tests.functional import base diff --git a/test-requirements.txt b/test-requirements.txt index 7a99f19d8..bb4354955 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,7 +18,7 @@ oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT -tempest-lib>=0.14.0 # Apache-2.0 +tempest>=11.0.0 # Apache-2.0 # releasenotes reno>=1.6.2 # Apache2