openstack/python-novaclient
Code Issues Proposed changes

Merge "Replace os-client-config to openstacksdk"

Browse Source
This commit is contained in:
Zuul 2018-08-15 15:38:56 +00:00 committed by Gerrit Code Review
commit c2d0fb7098
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
novaclient/tests/functional/base.py
View File

@ -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:

2
test-requirements.txt
View File

@ -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