openstack
/
rally
Code Issues Proposed changes

Merge "[Verify] Correctly configure auth URLs and auth version"

This commit is contained in:
Jenkins 2016-05-24 14:53:16 +00:00 committed by Gerrit Code Review
parent b90555ef77 9fe40dd002
commit 4ca1fde033
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,11 +210,18 @@ class TempestConfig(utils.RandomNameGeneratorMixin):
self.conf.set(section_name, "region",
self.credential["region_name"])
url_trailer = parse.urlparse(self.credential["auth_url"]).path
self.conf.set(section_name, "auth_version", url_trailer[1:3])
self.conf.set(section_name, "uri", self.credential["auth_url"])
auth_url = self.credential["auth_url"]
if "/v2" not in auth_url and "/v3" not in auth_url:
auth_version = "v2"
auth_url_v2 = parse.urljoin(auth_url, "/v2.0")
else:
url_path = parse.urlparse(auth_url).path
auth_version = url_path[1:3]
auth_url_v2 = auth_url.replace(url_path, "/v2.0")
self.conf.set(section_name, "auth_version", auth_version)
self.conf.set(section_name, "uri", auth_url_v2)
self.conf.set(section_name, "uri_v3",
self.credential["auth_url"].replace(url_trailer, "/v3"))
auth_url_v2.replace("/v2.0", "/v3"))
self.conf.set(section_name, "admin_domain_name",
self.credential["admin_domain_name"])

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

@ -34,7 +34,7 @@ CREDS = {
"username": "admin",
"tenant_name": "admin",
"password": "admin-12345",
"auth_url": "http://test/v2.0/",
"auth_url": "http://test:5000/v2.0/",
"permission": "admin",
"region_name": "test",
"admin_domain_name": "Default",
@ -149,7 +149,7 @@ class TempestConfigTestCase(test.TestCase):
("admin_domain_name", CREDS["admin"]["admin_domain_name"]),
("region", CREDS["admin"]["region_name"]),
("auth_version", "v2"),
("uri", CREDS["admin"]["auth_url"]),
("uri", CREDS["admin"]["auth_url"][:-1]),
("uri_v3", CREDS["admin"]["auth_url"].replace("/v2.0/", "/v3")),
("disable_ssl_certificate_validation",
str(CREDS["admin"]["https_insecure"])),