diff options
| -rw-r--r-- | novaclient/tests/functional/base.py | 11 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/novaclient/tests/functional/base.py b/novaclient/tests/functional/base.py index 943c44f4..ce50db94 100644 --- a/novaclient/tests/functional/base.py +++ b/novaclient/tests/functional/base.py @@ -22,7 +22,8 @@ from keystoneauth1 import session as ksession from keystoneclient import client as keystoneclient from keystoneclient import discover as keystone_discover from neutronclient.v2_0 import client as neutronclient -import os_client_config +import openstack.config +import openstack.config.exceptions from oslo_utils import uuidutils import tempest.lib.cli.base import testtools @@ -173,18 +174,18 @@ class ClientTestBase(testtools.TestCase): # tempest-lib, we do it in a way that's not available for top # level tests. Long term this probably needs to be in the base # class. - openstack_config = os_client_config.config.OpenStackConfig() + openstack_config = openstack.config.OpenStackConfig() try: cloud_config = openstack_config.get_one_cloud('functional_admin') - except os_client_config.exceptions.OpenStackConfigException: + except openstack.config.exceptions.OpenStackConfigException: try: cloud_config = openstack_config.get_one_cloud( 'devstack', auth=dict( username='admin', project_name='admin')) - except os_client_config.exceptions.OpenStackConfigException: + except openstack.config.exceptions.OpenStackConfigException: try: cloud_config = openstack_config.get_one_cloud('envvars') - except os_client_config.exceptions.OpenStackConfigException: + except openstack.config.exceptions.OpenStackConfigException: cloud_config = None if cloud_config is None: diff --git a/test-requirements.txt b/test-requirements.txt index 3c35fec9..b01fb80a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,7 +14,7 @@ python-cinderclient>=3.3.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 -os-client-config>=1.28.0 # Apache-2.0 +openstacksdk>=0.11.2 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD |