openstack
/
horizon
Code Issues Proposed changes

Merge "Added network's api mocking for the servers_update_addresses method"

This commit is contained in:
Jenkins 2014-03-31 14:59:49 +00:00 committed by Gerrit Code Review
parent a6a169d809 8516945bb4
commit 23aea6a5fb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/dashboards/project/instances/tests.py
View File

@ -2668,7 +2668,8 @@ class InstanceTests(test.TestCase):
'extension_supported',), 'extension_supported',),
api.glance: ('image_list_detailed',), api.glance: ('image_list_detailed',),
api.network: api.network:
('floating_ip_simple_associate_supported',), ('floating_ip_simple_associate_supported',
'servers_update_addresses',),
}) })
def test_index_form_action_with_pagination(self): def test_index_form_action_with_pagination(self):
"""The form action on the next page should have marker """The form action on the next page should have marker
@ -2688,9 +2689,13 @@ class InstanceTests(test.TestCase):
search_opts = {'marker': None, 'paginate': True} search_opts = {'marker': None, 'paginate': True}
api.nova.server_list(IsA(http.HttpRequest), search_opts=search_opts) \ api.nova.server_list(IsA(http.HttpRequest), search_opts=search_opts) \
.AndReturn([servers[:page_size], True]) .AndReturn([servers[:page_size], True])
api.network.servers_update_addresses(
IsA(http.HttpRequest), servers[:page_size])
api.nova.server_list(IsA(http.HttpRequest), search_opts={ api.nova.server_list(IsA(http.HttpRequest), search_opts={
'marker': servers[page_size - 1].id, 'paginate': True}) \ 'marker': servers[page_size - 1].id, 'paginate': True}) \
.AndReturn([servers[page_size:], False]) .AndReturn([servers[page_size:], False])
api.network.servers_update_addresses(
IsA(http.HttpRequest), servers[page_size:])
api.nova.tenant_absolute_limits(IsA(http.HttpRequest), reserved=True) \ api.nova.tenant_absolute_limits(IsA(http.HttpRequest), reserved=True) \
.MultipleTimes().AndReturn(self.limits['absolute']) .MultipleTimes().AndReturn(self.limits['absolute'])