From 4c181956c04039566782e7aab77022cc925483c1 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 1 Jul 2025 00:57:55 +0900 Subject: [PATCH] Replace os-client-config It was deprecated[1] after the code was merged into openstacksdk[2]. [1] https://review.opendev.org/c/openstack/os-client-config/+/549307 [2] https://review.opendev.org/c/openstack/openstacksdk/+/518128 Change-Id: I57c3489c84a06e788735aa2244907b8ef4875b8c --- glanceclient/tests/functional/base.py | 10 ++++++---- test-requirements.txt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/glanceclient/tests/functional/base.py b/glanceclient/tests/functional/base.py index 578dc395..f890f50f 100644 --- a/glanceclient/tests/functional/base.py +++ b/glanceclient/tests/functional/base.py @@ -10,13 +10,15 @@ # License for the specific language governing permissions and limitations # under the License. -import glanceclient +import os + from keystoneauth1 import loading from keystoneauth1 import session -import os -import os_client_config +from openstack import config as occ from tempest.lib.cli import base +import glanceclient + def credentials(cloud='devstack-admin'): """Retrieves credentials to run functional tests @@ -31,7 +33,7 @@ def credentials(cloud='devstack-admin'): cloud as that is the current expected behavior. """ - return os_client_config.OpenStackConfig().get_one_cloud(cloud=cloud) + return occ.OpenStackConfig().get_one(cloud=cloud) class ClientTestBase(base.ClientTestBase): diff --git a/test-requirements.txt b/test-requirements.txt index 39b8dcd3..f648a2a1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,6 @@ hacking>=6.1.0,<6.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -os-client-config>=1.28.0 # Apache-2.0 +openstacksdk>=0.10.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT testscenarios>=0.4 # Apache-2.0/BSD