MAAS

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

  1. fix-1499428
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4307
Proposed branch: lp:~blake-rouse/maas/fix-1499428
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 53 lines (+7/-0)
3 files modified
src/maasserver/api/networks.py (+3/-0)
src/maasserver/api/tests/test_network.py (+2/-0)
src/maasserver/api/tests/test_networks.py (+2/-0)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1499428
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+272305@code.launchpad.net

Commit message

Fix missing resource_uri on the networks endpoint.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Ship it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1919
20import re20import re
2121
22from django.core.urlresolvers import reverse
22from django.shortcuts import get_object_or_40423from django.shortcuts import get_object_or_404
23from maasserver.api.support import (24from maasserver.api.support import (
24 admin_method,25 admin_method,
@@ -60,6 +61,8 @@
60 "description": subnet.name,61 "description": subnet.name,
61 "default_gateway": subnet.gateway_ip,62 "default_gateway": subnet.gateway_ip,
62 "dns_servers": subnet.dns_servers,63 "dns_servers": subnet.dns_servers,
64 "resource_uri": reverse(
65 'network_handler', args=["subnet-%d" % subnet.id]),
63 }66 }
6467
6568
6669
=== 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 @@
64 subnet.name,64 subnet.name,
65 subnet.gateway_ip,65 subnet.gateway_ip,
66 subnet.dns_servers,66 subnet.dns_servers,
67 reverse('network_handler', args=["subnet-%d" % subnet.id]),
67 ),68 ),
68 (69 (
69 parsed_result['name'],70 parsed_result['name'],
@@ -73,6 +74,7 @@
73 parsed_result['description'],74 parsed_result['description'],
74 parsed_result['default_gateway'],75 parsed_result['default_gateway'],
75 parsed_result['dns_servers'],76 parsed_result['dns_servers'],
77 parsed_result['resource_uri'],
76 ))78 ))
7779
78 def test_GET_returns_404_for_unknown_network(self):80 def test_GET_returns_404_for_unknown_network(self):
7981
=== 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 @@
81 "description": subnet.name,81 "description": subnet.name,
82 "default_gateway": subnet.gateway_ip,82 "default_gateway": subnet.gateway_ip,
83 "dns_servers": subnet.dns_servers,83 "dns_servers": subnet.dns_servers,
84 "resource_uri": reverse(
85 'network_handler', args=["subnet-%d" % subnet.id]),
84 }, returned_subnet)86 }, returned_subnet)
8587
86 def test_GET_returns_empty_if_no_subnets(self):88 def test_GET_returns_empty_if_no_subnets(self):