openstack/rally
Code Issues Proposed changes

Merge "Fix Zaqar client issue"

Browse Source
This commit is contained in:
Jenkins
2016-04-07 22:36:00 +00:00
committed by Gerrit Code Review
parent cc5def3c87 ab684474c9
commit 7fdfbfbacf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rally/osclients.py
View File

@@ -523,7 +523,7 @@ class Zaqar(OSClient):
"os_username": self.credential.username,
"os_password": self.credential.password,
"os_project_name": self.credential.tenant_name,
"os_project_id": kc.auth_tenant_id,
"os_project_id": kc.auth_ref.get("token").get("tenant").get("id"),
"os_auth_url": self.credential.auth_url,
"insecure": self.credential.insecure,
}}}

3
tests/unit/test_osclients.py
View File

@@ -568,6 +568,7 @@ class OSClientsTestCase(test.TestCase):
mock_zaqar = mock.MagicMock()
mock_zaqar.client.Client = mock.MagicMock(return_value=fake_zaqar)
self.assertNotIn("zaqar", self.clients.cache)
p_id = self.fake_keystone.auth_ref.get("token").get("tenant").get("id")
with mock.patch.dict("sys.modules", {"zaqarclient.queues":
mock_zaqar}):
client = self.clients.zaqar()
@@ -581,7 +582,7 @@ class OSClientsTestCase(test.TestCase):
"os_username": self.credential.username,
"os_password": self.credential.password,
"os_project_name": self.credential.tenant_name,
"os_project_id": self.fake_keystone.auth_tenant_id,
"os_project_id": p_id,
"os_auth_url": self.credential.auth_url,
"insecure": self.credential.insecure,
}}}