Merge "Disable Client Caching"

This commit is contained in:
Jenkins 2016-09-28 21:32:34 +00:00 committed by Gerrit Code Review
commit dda2cff000
2 changed files with 9 additions and 1 deletions

View File

@ -84,6 +84,13 @@ class OpenStackAction(base.Action):
(e.g. Nova, Glance, Heat, Keystone etc)
"""
# TODO(d0ugal): Caching has caused some security problems and
# regressions in Mistral. It is disabled for now and
# will be revisited in Ocata. See:
# https://bugs.launchpad.net/mistral/+bug/1627689
return self._create_client()
ctx = context.ctx()
client_class = self.__class__.__name__
# Colon character is reserved (rfc3986) which avoids key collisions.

View File

@ -123,7 +123,8 @@ class OpenStackActionTest(base.BaseTestCase):
mock_novaclient.reset_mock()
action.run()
mock_novaclient.Client.assert_not_called()
# TODO(d0ugal): Uncomment the following line when caching is fixed.
# mock_novaclient.Client.assert_not_called()
mock_novaclient.Client().servers.get.assert_called_with(
server="1234-abcd")