
Encoding the path separators results in urls refused by by apache with 404 unless AllowEncodedSlashes is turned on, which is not the default. The existing encoding of path separators seems unnecessary. Change-Id: I3b77aafc6104119503363e5db36b0379964daba5
154 lines
6.1 KiB
Python
154 lines
6.1 KiB
Python
# Copyright 2013 IBM Corp.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
import testtools
|
|
|
|
from heatclient.common import utils
|
|
from heatclient.v1 import events
|
|
|
|
|
|
class EventManagerTest(testtools.TestCase):
|
|
|
|
def test_list_event(self):
|
|
stack_id = 'teststack',
|
|
resource_name = 'testresource'
|
|
manager = events.EventManager(None)
|
|
with mock.patch('heatclient.v1.events.EventManager._resolve_stack_id')\
|
|
as mock_re:
|
|
mock_re.return_value = 'teststack/abcd1234'
|
|
|
|
manager._list = mock.MagicMock()
|
|
manager.list(stack_id, resource_name)
|
|
# Make sure url is correct.
|
|
manager._list.assert_called_once_with(
|
|
'/stacks/teststack/abcd1234/'
|
|
'resources/testresource/events',
|
|
"events")
|
|
mock_re.assert_called_once_with(stack_id)
|
|
|
|
def test_list_event_with_unicode_resource_name(self):
|
|
stack_id = 'teststack',
|
|
resource_name = u'\u5de5\u4f5c'
|
|
manager = events.EventManager(None)
|
|
with mock.patch('heatclient.v1.events.EventManager._resolve_stack_id')\
|
|
as mock_re:
|
|
mock_re.return_value = 'teststack/abcd1234'
|
|
|
|
manager._list = mock.MagicMock()
|
|
manager.list(stack_id, resource_name)
|
|
# Make sure url is correct.
|
|
manager._list.assert_called_once_with(
|
|
'/stacks/teststack/abcd1234/'
|
|
'resources/%E5%B7%A5%E4%BD%9C/'
|
|
'events', "events")
|
|
mock_re.assert_called_once_with(stack_id)
|
|
|
|
def test_list_event_with_none_resource_name(self):
|
|
stack_id = 'teststack',
|
|
manager = events.EventManager(None)
|
|
manager._list = mock.MagicMock()
|
|
manager.list(stack_id)
|
|
# Make sure url is correct.
|
|
manager._list.assert_called_once_with('/stacks/teststack/'
|
|
'events', "events")
|
|
|
|
def test_list_event_with_kwargs(self):
|
|
stack_id = 'teststack',
|
|
resource_name = 'testresource'
|
|
kwargs = {'limit': 2,
|
|
'marker': '6d6935f4-0ae5',
|
|
'filters': {
|
|
'resource_action': 'CREATE',
|
|
'resource_status': 'COMPLETE'
|
|
}}
|
|
manager = events.EventManager(None)
|
|
manager = events.EventManager(None)
|
|
with mock.patch('heatclient.v1.events.EventManager._resolve_stack_id')\
|
|
as mock_re:
|
|
mock_re.return_value = 'teststack/abcd1234'
|
|
|
|
manager._list = mock.MagicMock()
|
|
manager.list(stack_id, resource_name, **kwargs)
|
|
# Make sure url is correct.
|
|
self.assertEqual(1, manager._list.call_count)
|
|
args = manager._list.call_args
|
|
self.assertEqual(2, len(args[0]))
|
|
url, param = args[0]
|
|
self.assertEqual("events", param)
|
|
base_url, query_params = utils.parse_query_url(url)
|
|
expected_base_url = ('/stacks/teststack/abcd1234/'
|
|
'resources/testresource/events')
|
|
self.assertEqual(expected_base_url, base_url)
|
|
expected_query_dict = {'marker': ['6d6935f4-0ae5'],
|
|
'limit': ['2'],
|
|
'resource_action': ['CREATE'],
|
|
'resource_status': ['COMPLETE']}
|
|
self.assertEqual(expected_query_dict, query_params)
|
|
mock_re.assert_called_once_with(stack_id)
|
|
|
|
@mock.patch('heatclient.v1.events.EventManager._resolve_stack_id')
|
|
@mock.patch('heatclient.common.utils.get_response_body')
|
|
def test_get_event(self, mock_utils, mock_re):
|
|
fields = {'stack_id': 'teststack',
|
|
'resource_name': 'testresource',
|
|
'event_id': '1'}
|
|
|
|
class FakeAPI(object):
|
|
"""Fake API and ensure request url is correct."""
|
|
|
|
def json_request(self, *args, **kwargs):
|
|
expect = ('GET',
|
|
'/stacks/teststack/abcd1234/resources'
|
|
'/testresource/events/1')
|
|
assert args == expect
|
|
return {}, {'event': []}
|
|
|
|
def get(self, *args, **kwargs):
|
|
pass
|
|
|
|
manager = events.EventManager(FakeAPI())
|
|
with mock.patch('heatclient.v1.events.Event'):
|
|
mock_utils.return_value = {'event': []}
|
|
mock_re.return_value = 'teststack/abcd1234'
|
|
manager.get(**fields)
|
|
mock_re.assert_called_once_with('teststack')
|
|
|
|
@mock.patch('heatclient.v1.events.EventManager._resolve_stack_id')
|
|
@mock.patch('heatclient.common.utils.get_response_body')
|
|
def test_get_event_with_unicode_resource_name(self, mock_utils, mock_re):
|
|
fields = {'stack_id': 'teststack',
|
|
'resource_name': u'\u5de5\u4f5c',
|
|
'event_id': '1'}
|
|
|
|
class FakeAPI(object):
|
|
"""Fake API and ensure request url is correct."""
|
|
|
|
def json_request(self, *args, **kwargs):
|
|
expect = ('GET',
|
|
'/stacks/teststack/abcd1234/resources'
|
|
'/%E5%B7%A5%E4%BD%9C/events/1')
|
|
assert args == expect
|
|
return {}, {'event': []}
|
|
|
|
def get(self, *args, **kwargs):
|
|
pass
|
|
|
|
manager = events.EventManager(FakeAPI())
|
|
with mock.patch('heatclient.v1.events.Event'):
|
|
mock_utils.return_value = {'event': []}
|
|
mock_re.return_value = 'teststack/abcd1234'
|
|
manager.get(**fields)
|
|
mock_re.assert_called_once_with('teststack')
|