Merge pull request #75 from digitalocean/fix-prefix-idempotence

Fix prefix idempotence

pynetbox/lib/response.py

@@ -20,13 +20,30 @@
 
 
 def get_return(lookup, return_fields=None):
+    '''Returns simple representations for items passed to lookup.
+
+    Used to return a "simple" representation of objects and collections
+    sent to it via lookup. If lookup is an IPNetwork object immediately
+    return the string representation. Otherwise, we look to see if
+    lookup is a "choices" field (dict with only 'id' and 'value')
+    or a nested_return. Finally, we check if it's a Record, if
+    so simply return a string. Order is important due to nested_return
+    being self-referential.
+
+    :arg list,optional return_fields: A list of fields to reference when
+        calling values on lookup.
+    '''
+
+    if isinstance(lookup, netaddr.IPNetwork):
+        return str(lookup)
 
     for i in return_fields or ['id', 'value', 'nested_return']:
         if isinstance(lookup, dict) and lookup.get(i):
             return lookup[i]
         else:
             if hasattr(lookup, i):
                 return getattr(lookup, i)
+
     if isinstance(lookup, Record):
         return str(lookup)
     else:

tests/test_ipam.py

@@ -126,6 +126,19 @@ def test_modify(self, mock):
         self.assertEqual(ret_serialized['prefix'], '10.1.2.0/24')
         self.assertTrue(netaddr.IPNetwork(ret_serialized['prefix']))
 
+    @patch(
+        'pynetbox.lib.query.requests.put',
+        return_value=Response(fixture='ipam/prefix.json')
+    )
+    @patch(
+        'pynetbox.lib.query.requests.get',
+        return_value=Response(fixture='ipam/prefix.json')
+    )
+    def test_idempotence(self, *_):
+        ret = nb.prefixes.get(1)
+        test = ret.save()
+        self.assertFalse(test)
+
     @patch(
         'pynetbox.lib.query.requests.get',
         side_effect=[