Merge lp:~rvb/maas/network-listing-pagination into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix network listing: add pagination.

[Jeroen T. Vermeulen (jtv)]

Paginated network listings? Somebody has been shopping for hardware. :-)

The output on that final test assertion is a nice touch.

I'm not usually one to argue against comments and documentation, but, in lines 35 and 36 of the diff:

        # Create 4 networks.
        factory.make_networks(4)

Duh. :) Probably doesn't need the comment.

And in lines 38 and 39:

        self.assertEqual(
            httplib.OK, response.status_code, response.content)

Test failures show response content now, so no more need to pass it to the assertion!

review: Approve

[Raphaël Badin (rvb)]

> Paginated network listings? Somebody has been shopping for hardware. :-)
>
> The output on that final test assertion is a nice touch.
>
> I'm not usually one to argue against comments and documentation, but, in lines
> 35 and 36 of the diff:
>
> # Create 4 networks.
> factory.make_networks(4)
>
> Duh. :) Probably doesn't need the comment.
>
> And in lines 38 and 39:
>
> self.assertEqual(
> httplib.OK, response.status_code, response.content)
>
> Test failures show response content now, so no more need to pass it to the
> assertion!

All done, thanks for the review!

=== modified file 'src/maasserver/templates/maasserver/network_list.html'
--- src/maasserver/templates/maasserver/network_list.html	2014-02-24 07:48:20 +0000
+++ src/maasserver/templates/maasserver/network_list.html	2014-03-25 11:23:12 +0000
@@ -75,6 +75,7 @@
           {% endfor %}
         </tbody>
       </table>
+      {% include "maasserver/pagination.html" %}
       {% else %}
       No networks defined.
       {% endif %}

=== modified file 'src/maasserver/views/tests/test_networks.py'
--- src/maasserver/views/tests/test_networks.py	2014-02-24 07:50:40 +0000
+++ src/maasserver/views/tests/test_networks.py	2014-03-25 11:23:12 +0000
@@ -30,7 +30,10 @@
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import get_one
-from maasserver.views.networks import NetworkAdd
+from maasserver.views.networks import (
+    NetworkAdd,
+    NetworkListView,
+    )
 from testtools.matchers import (
     Contains,
     ContainsAll,
@@ -101,6 +104,17 @@
             [link for link in get_content_links(response)
                 if link.startswith('/nodes/')])
 
+    def test_network_listing_is_paginated(self):
+        self.patch(NetworkListView, "paginate_by", 3)
+        self.client_log_in(as_admin=True)
+        factory.make_networks(4)
+        response = self.client.get(reverse('network-list'))
+        self.assertEqual(httplib.OK, response.status_code)
+        doc = fromstring(response.content)
+        self.assertEqual(
+            1, len(doc.cssselect('div.pagination')),
+            "Couldn't find pagination tag.")
+
 
 class NetworkListingViewTestNonAdmin(MAASServerTestCase):