Merge "Replace os-client-config"
This commit is contained in:
@@ -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):
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user