Merge lp:~blake-rouse/maas/fix-1499428 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix missing resource_uri on the networks endpoint.

[Mike Pontillo (mpontillo)]

Ship it!

review: Approve

=== modified file 'src/maasserver/api/networks.py'
--- src/maasserver/api/networks.py	2015-09-09 21:06:11 +0000
+++ src/maasserver/api/networks.py	2015-09-24 19:14:13 +0000
@@ -19,6 +19,7 @@
 
 import re
 
+from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 from maasserver.api.support import (
     admin_method,
@@ -60,6 +61,8 @@
         "description": subnet.name,
         "default_gateway": subnet.gateway_ip,
         "dns_servers": subnet.dns_servers,
+        "resource_uri": reverse(
+            'network_handler', args=["subnet-%d" % subnet.id]),
     }
 
 

=== modified file 'src/maasserver/api/tests/test_network.py'
--- src/maasserver/api/tests/test_network.py	2015-09-09 21:06:11 +0000
+++ src/maasserver/api/tests/test_network.py	2015-09-24 19:14:13 +0000
@@ -64,6 +64,7 @@
                 subnet.name,
                 subnet.gateway_ip,
                 subnet.dns_servers,
+                reverse('network_handler', args=["subnet-%d" % subnet.id]),
             ),
             (
                 parsed_result['name'],
@@ -73,6 +74,7 @@
                 parsed_result['description'],
                 parsed_result['default_gateway'],
                 parsed_result['dns_servers'],
+                parsed_result['resource_uri'],
             ))
 
     def test_GET_returns_404_for_unknown_network(self):

=== modified file 'src/maasserver/api/tests/test_networks.py'
--- src/maasserver/api/tests/test_networks.py	2015-09-09 21:06:11 +0000
+++ src/maasserver/api/tests/test_networks.py	2015-09-24 19:14:13 +0000
@@ -81,6 +81,8 @@
             "description": subnet.name,
             "default_gateway": subnet.gateway_ip,
             "dns_servers": subnet.dns_servers,
+            "resource_uri": reverse(
+                'network_handler', args=["subnet-%d" % subnet.id]),
             }, returned_subnet)
 
     def test_GET_returns_empty_if_no_subnets(self):