openstack/rally
Code Issues Proposed changes

Add region_name when generate tempest conf

Browse Source 
Change-Id: I4aa3152dd192a38b4ebb43d57c3088913c2d752f
Closes-Bug: #1517237
This commit is contained in:
Bo Chi 2015-11-25 13:22:27 -05:00
parent 059dae4238
commit 9d89acf8fc
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rally/verification/tempest/config.py
View File

@ -158,6 +158,9 @@ class TempestConfig(utils.RandomNameGeneratorMixin):
self.conf.set(section_name, "admin_tenant_name",
self.endpoint["tenant_name"])
self.conf.set(section_name, "region",
self.endpoint["region_name"])
self.conf.set(section_name, "uri", self.endpoint["auth_url"])
v2_url_trailer = parse.urlparse(self.endpoint["auth_url"]).path
self.conf.set(section_name, "uri_v3",

2
tests/unit/verification/test_config.py
View File

@ -36,6 +36,7 @@ CREDS = {
"password": "admin-12345",
"auth_url": "http://test/v2.0/",
"permission": "admin",
"region_name": "test",
"admin_domain_name": "Default",
"https_insecure": False,
"https_cacert": "/path/to/cacert/file"
@ -141,6 +142,7 @@ class TempestConfigTestCase(test.TestCase):
("admin_password", CREDS["admin"]["password"]),
("admin_tenant_name", CREDS["admin"]["username"]),
("admin_domain_name", CREDS["admin"]["admin_domain_name"]),
("region", CREDS["admin"]["region_name"]),
("uri", CREDS["admin"]["auth_url"]),
("uri_v3", CREDS["admin"]["auth_url"].replace("/v2.0/", "/v3")),
("disable_ssl_certificate_validation",