Merge pull request #111 from digitalocean/110-tagged-vlan-serializer

Fixes #110 - Not properly serializing tagged_vlan field.

Author: Zach Moody

pynetbox/lib/response.py

@@ -150,6 +150,12 @@ def _parse_values(self, values):
         Parses values dict at init and sets object attributes with the
         values within.
         """
+
+        def list_parser(list_item):
+            if isinstance(list_item, dict):
+                return self.default_ret(list_item, api_kwargs=self.api_kwargs)
+            return list_item
+
         for k, v in values.items():
 
             if k not in JSON_FIELDS:
@@ -159,6 +165,10 @@ def _parse_values(self, values):
                         v = lookup(v, api_kwargs=self.api_kwargs)
                     else:
                         v = self.default_ret(v, api_kwargs=self.api_kwargs)
+
+                if isinstance(v, list):
+                    v = [list_parser(i) for i in v]
+
                 self._add_cache((k, v))
             else:
                 self._add_cache((k, v.copy()))
@@ -238,6 +248,11 @@ def serialize(self, nested=False):
                 if isinstance(current_val, netaddr.ip.IPNetwork):
                     current_val = str(current_val)
 
+                if isinstance(current_val, list):
+                    current_val = [
+                        v.id if isinstance(v, Record) else v
+                        for v in current_val
+                    ]
                 ret[i] = current_val
         return ret
 

tests/unit/__init__.py

@@ -0,0 +1,39 @@
+import unittest
+
+from pynetbox.lib.response import Record
+
+
+class RecordTestCase(unittest.TestCase):
+
+    def test_serialize_list_of_records(self):
+        test_values = {
+            'id': 123,
+            "tagged_vlans": [
+                {
+                    "id": 1,
+                    "url": "http://localhost:8000/api/ipam/vlans/1/",
+                    "vid": 1,
+                    "name": "test1",
+                    "display_name": "test1"
+                },
+                {
+                    "id": 2,
+                    "url": "http://localhost:8000/api/ipam/vlans/2/",
+                    "vid": 2,
+                    "name": "test 2",
+                    "display_name": "test2"
+                }
+            ],
+        }
+        test_obj = Record(test_values)
+        test = test_obj.serialize()
+        self.assertEqual(test['tagged_vlans'], [1, 2])
+
+    def test_serialize_list_of_ints(self):
+        test_values = {
+            'id': 123,
+            'units': [12],
+        }
+        test_obj = Record(test_values)
+        test = test_obj.serialize()
+        self.assertEqual(test['units'], [12])