Merge lp:~mpontillo/maas/spaces-api-backward-compat--bug-1656208 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix backward compatibility for spaces endpoint.

Drive-by fix to add the missing `resource_uri`.

[Brendan Donegan (brendan-donegan)]

This CI run using this branch still fails, apparently for the same reason - http://162.213.35.104:8080/job/juju_bootstrap_fix/1

review: Needs Fixing

[Mike Pontillo (mpontillo)]

Actually, this failure is a separate bug. I filed it here:

https://bugs.launchpad.net/bugs/1656717

=== modified file 'src/maasserver/api/spaces.py'
--- src/maasserver/api/spaces.py	2017-01-04 19:37:16 +0000
+++ src/maasserver/api/spaces.py	2017-01-14 02:48:00 +0000
@@ -18,6 +18,7 @@
 
 
 DISPLAYED_SPACE_FIELDS = (
+    'resource_uri',
     'id',
     'name',
     'vlans',
@@ -78,33 +79,11 @@
 
     @classmethod
     def subnets(cls, space):
-        """Return an abbreviated view of each subnet in the space."""
-        subnets = Subnet.objects.filter(vlan__space=space)
-        return [
-            {
-                "id": subnet.id,
-                "name": subnet.name,
-                "cidr": str(subnet.cidr),
-                "vlan": subnet.vlan_id
-            }
-            for subnet in subnets
-        ]
+        return Subnet.objects.filter(vlan__space=space)
 
     @classmethod
     def vlans(cls, space):
-        """Return an abbreviated view of each VLAN in the space."""
-        return [
-            {
-                "id": vlan.id,
-                "vid": vlan.vid,
-                "name": vlan.name,
-                "fabric": {
-                    "id": vlan.fabric.id,
-                    "name": vlan.fabric.name,
-                }
-            }
-            for vlan in space.vlan_set.all()
-        ]
+        return space.vlan_set.all()
 
     def read(self, request, id):
         """Read space.
 
=== modified file 'src/maasserver/api/tests/test_spaces.py'
--- src/maasserver/api/tests/test_spaces.py	2016-05-24 21:29:53 +0000
+++ src/maasserver/api/tests/test_spaces.py	2017-01-14 02:48:00 +0000
@@ -121,6 +121,42 @@
         ]
         self.assertItemsEqual(subnet_ids, parsed_subnets)
 
+    def test_includes_vlan_objects(self):
+        space = factory.make_Space()
+        vlan = factory.make_VLAN(space=space)
+        uri = get_space_uri(space)
+        response = self.client.get(uri)
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_space = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        parsed_vlan = parsed_space['vlans'][0]
+        self.assertThat(parsed_vlan, ContainsDict({
+            "id": Equals(vlan.id),
+            "vid": Equals(vlan.vid),
+            "fabric_id": Equals(vlan.fabric_id),
+        }))
+
+    def test_includes_legacy_subnet_objects(self):
+        space = factory.make_Space()
+        subnet = factory.make_Subnet(space=space)
+        uri = get_space_uri(space)
+        response = self.client.get(uri)
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        parsed_space = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        parsed_subnet = parsed_space['subnets'][0]
+        self.assertThat(parsed_subnet, ContainsDict({
+            "id": Equals(subnet.id),
+            "cidr": Equals(str(subnet.cidr)),
+        }))
+        self.assertThat(parsed_subnet['vlan'], ContainsDict({
+            "id": Equals(subnet.vlan.id),
+            "vid": Equals(subnet.vlan.vid),
+            "fabric_id": Equals(subnet.vlan.fabric_id),
+        }))
+
     def test_read_404_when_bad_id(self):
         uri = reverse(
             'space_handler', args=[random.randint(100, 1000)])