Browse Source

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

tags/2014.1.rc1^0
Jenkins 5 years ago
parent
commit
23aea6a5fb
1 changed files with 6 additions and 1 deletions
  1. 6
    1
      openstack_dashboard/dashboards/project/instances/tests.py

+ 6
- 1
openstack_dashboard/dashboards/project/instances/tests.py View File

@@ -2668,7 +2668,8 @@ class InstanceTests(test.TestCase):
2668 2668
                                    'extension_supported',),
2669 2669
                         api.glance: ('image_list_detailed',),
2670 2670
                         api.network:
2671
-                            ('floating_ip_simple_associate_supported',),
2671
+                            ('floating_ip_simple_associate_supported',
2672
+                             'servers_update_addresses',),
2672 2673
                         })
2673 2674
     def test_index_form_action_with_pagination(self):
2674 2675
         """The form action on the next page should have marker
@@ -2688,9 +2689,13 @@ class InstanceTests(test.TestCase):
2688 2689
         search_opts = {'marker': None, 'paginate': True}
2689 2690
         api.nova.server_list(IsA(http.HttpRequest), search_opts=search_opts) \
2690 2691
             .AndReturn([servers[:page_size], True])
2692
+        api.network.servers_update_addresses(
2693
+            IsA(http.HttpRequest), servers[:page_size])
2691 2694
         api.nova.server_list(IsA(http.HttpRequest), search_opts={
2692 2695
             'marker': servers[page_size - 1].id, 'paginate': True}) \
2693 2696
             .AndReturn([servers[page_size:], False])
2697
+        api.network.servers_update_addresses(
2698
+            IsA(http.HttpRequest), servers[page_size:])
2694 2699
 
2695 2700
         api.nova.tenant_absolute_limits(IsA(http.HttpRequest), reserved=True) \
2696 2701
            .MultipleTimes().AndReturn(self.limits['absolute'])

Loading…
Cancel
Save