Merge "Fixed imcompatible argument in service create with keystone v2/3 API"

This commit is contained in:
Jenkins 2016-03-04 04:32:55 +00:00 committed by Gerrit Code Review
commit f7355aebe7
2 changed files with 2 additions and 2 deletions

View File

@ -82,7 +82,7 @@ class KeystoneScenario(scenario.OpenStackScenario):
description = description or self.generate_random_name()
return self.admin_clients("keystone").services.create(
self.generate_random_name(),
service_type, description)
service_type, description=description)
@atomic.action_timer("keystone.create_users")
def _users_create(self, tenant, users_per_tenant):

View File

@ -155,7 +155,7 @@ class KeystoneScenarioTestCase(test.ScenarioTestCase):
result)
self.admin_clients("keystone").services.create.assert_called_once_with(
scenario.generate_random_name.return_value,
service_type, description)
service_type, description=description)
self._test_atomic_action_timer(scenario.atomic_actions(),
"keystone.create_service")