openstack/rally-openstack
Code Issues Proposed changes

[CI][cli] use env variable to determine KeystoneV3

Browse Source 
`rally deployment create --fromenv` tries to guess keystone version
by presence of "USER_DOMAIN_NAME" or "PROJECT_DOMAIN_NAME" environment
variables. But this cariable can be missed. Let's check special variable
for keystone version - OS_IDENTITY_API_VERSION or IDENTITY_API_VERSION.

Also, this patch fixes DeploymentTestCase.test_config functional test to
support keystone v3

Change-Id: Ia75109fb8388b7b02af764c5f93ef5bd04f00676
This commit is contained in:
Andrey Kurilin 2016-12-04 22:45:55 +02:00
parent 39eb061a6f
commit acd3668119
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/functional/test_cli_deployment.py
View File

@ -50,8 +50,14 @@ class DeploymentTestCase(unittest.TestCase):
config["admin"]["username"])
self.assertEqual(utils.TEST_ENV["OS_PASSWORD"],
config["admin"]["password"])
self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"],
config["admin"]["tenant_name"])
if "project_name" in config["admin"]:
# keystone v3
self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"],
config["admin"]["project_name"])
else:
# keystone v2
self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"],
config["admin"]["tenant_name"])
self.assertEqual(utils.TEST_ENV["OS_AUTH_URL"],
config["auth_url"])