openstack/rally-openstack
Code Issues Proposed changes

Merge "Fixed project creation with Keystone v3"

Browse Source
This commit is contained in:
Jenkins 2017-04-07 15:28:36 +00:00 committed by Gerrit Code Review
commit 21b7a5310f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rally/plugins/openstack/services/identity/keystone_v3.py
View File

@ -231,7 +231,8 @@ class UnifiedKeystoneV3Service(keystone_common.UnifiedKeystoneMixin,
:param project_name: Name of project to be created. :param project_name: Name of project to be created.
:param domain_name: Name or id of domain where to create project, :param domain_name: Name or id of domain where to create project,
""" """
project = self._impl.create_project(project_name) project = self._impl.create_project(project_name,
domain_name=domain_name)
return self._unify_project(project) return self._unify_project(project)
def update_project(self, project_id, name=None, enabled=None, def update_project(self, project_id, name=None, enabled=None,

6
tests/unit/plugins/openstack/services/identity/test_keystone_v3.py
View File

@ -402,12 +402,14 @@ class UnifiedKeystoneV3ServiceTestCase(test.TestCase):
mock_unified_keystone_v3_service__unify_project): mock_unified_keystone_v3_service__unify_project):
mock_unify_project = mock_unified_keystone_v3_service__unify_project mock_unify_project = mock_unified_keystone_v3_service__unify_project
name = "name" name = "name"
domain = "domain"
self.assertEqual(mock_unify_project.return_value, self.assertEqual(mock_unify_project.return_value,
self.service.create_project(name)) self.service.create_project(name, domain_name=domain))
mock_unify_project.assert_called_once_with( mock_unify_project.assert_called_once_with(
self.service._impl.create_project.return_value) self.service._impl.create_project.return_value)
self.service._impl.create_project.assert_called_once_with(name) self.service._impl.create_project.assert_called_once_with(
name, domain_name=domain)
def test_update_project(self): def test_update_project(self):
project_id = "fake_id" project_id = "fake_id"