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
This commit is contained in:
@@ -10,13 +10,15 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import glanceclient
|
import os
|
||||||
|
|
||||||
from keystoneauth1 import loading
|
from keystoneauth1 import loading
|
||||||
from keystoneauth1 import session
|
from keystoneauth1 import session
|
||||||
import os
|
from openstack import config as occ
|
||||||
import os_client_config
|
|
||||||
from tempest.lib.cli import base
|
from tempest.lib.cli import base
|
||||||
|
|
||||||
|
import glanceclient
|
||||||
|
|
||||||
|
|
||||||
def credentials(cloud='devstack-admin'):
|
def credentials(cloud='devstack-admin'):
|
||||||
"""Retrieves credentials to run functional tests
|
"""Retrieves credentials to run functional tests
|
||||||
@@ -31,7 +33,7 @@ def credentials(cloud='devstack-admin'):
|
|||||||
cloud as that is the current expected behavior.
|
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):
|
class ClientTestBase(base.ClientTestBase):
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
hacking>=6.1.0,<6.2.0 # Apache-2.0
|
hacking>=6.1.0,<6.2.0 # Apache-2.0
|
||||||
coverage!=4.4,>=4.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
|
stestr>=2.0.0 # Apache-2.0
|
||||||
testtools>=2.2.0 # MIT
|
testtools>=2.2.0 # MIT
|
||||||
testscenarios>=0.4 # Apache-2.0/BSD
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
|
|||||||
Reference in New Issue
Block a user