openstack
/
python-ironicclient
Code Issues Proposed changes

Change os_tenant_name to os_project_name in tests configuration script 

OS_TENANT_NAME variable is deprecated in Devstack.
Replace it with OS_PROJECT_NAME variable in configuration script
tools/run_functional.sh which generates config dynamically.

Change-Id: I7b2fab37aeae6e37672b9b92f0b5ae49a1b2e2d9
Related-Bug: #1646837
This commit is contained in:
Kyrylo Romanenko 2016-12-07 19:35:21 +02:00
parent 56f19eef8b
commit 5edcdf0d60
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/testing.rst
View File

@ -53,7 +53,7 @@ An example test.conf file::
os_auth_url=http://192.168.0.2:5000/v2.0/
os_username=admin
os_password=admin
os_tenant_name=admin
os_project_name=admin
If you are testing ironic in standalone mode, only the parameters
'auth_strategy', 'os_auth_token' and 'ironic_url' are required;

4
ironicclient/tests/functional/base.py
View File

@ -42,7 +42,7 @@ class FunctionalTestBase(base.ClientTestBase):
client = base.CLIClient(cli_dir=cli_dir,
username=config['os_username'],
password=config['os_password'],
tenant_name=config['os_tenant_name'],
tenant_name=config['os_project_name'],
uri=config['os_auth_url'])
for keystone_object in 'user', 'project':
domain_attr = 'os_%s_domain_id' % keystone_object
@ -79,7 +79,7 @@ class FunctionalTestBase(base.ClientTestBase):
keystone_v3_conf_settings = []
if auth_strategy == 'keystone':
conf_settings += ['os_auth_url', 'os_username',
'os_password', 'os_tenant_name']
'os_password', 'os_project_name']
keystone_v3_conf_settings += ['os_user_domain_id',
'os_project_domain_id']
else:

4
tools/run_functional.sh
View File

@ -18,11 +18,11 @@ api_version = 1
os_auth_url=$OS_AUTH_URL
os_username=$OS_USERNAME
os_password=$OS_PASSWORD
os_tenant_name=$OS_TENANT_NAME
os_project_name=$OS_PROJECT_NAME
os_user_domain_id=$OS_USER_DOMAIN_ID
os_project_domain_id=$OS_PROJECT_DOMAIN_ID
os_service_type=baremetal
os_endpoint_type=public
END
fi
tox -e functional
tox -e functional