Merge pull request #210 from fach/master

Fix using Record objects in hashable collections

Author: Zach Moody

pynetbox/core/endpoint.py

@@ -42,6 +42,7 @@ class Endpoint(object):
 
     def __init__(self, api, app, name, model=None):
         self.return_obj = self._lookup_ret_obj(name, model)
+        self.name = name.replace("_", "-")
         self.api = api
         self.base_url = api.base_url
         self.token = api.token
@@ -50,7 +51,7 @@ def __init__(self, api, app, name, model=None):
         self.url = "{base_url}/{app}/{endpoint}".format(
             base_url=self.base_url,
             app=app.name,
-            endpoint=name.replace("_", "-"),
+            endpoint=self.name,
         )
         self._choices = None
 

pynetbox/core/response.py

@@ -213,11 +213,19 @@ def __getstate__(self):
     def __setstate__(self, d):
         self.__dict__.update(d)
 
-    def __hash__(self):
+    def __key__(self):
         if hasattr(self, "id"):
-            return hash((self.endpoint.name, self.id))
+            return (self.endpoint.name, self.id)
         else:
-            return hash(self.endpoint.name)
+            return (self.endpoint.name)
+
+    def __hash__(self):
+        return hash(self.__key__())
+
+    def __eq__(self, other):
+        if isinstance(other, Record):
+            return self.__key__() == other.__key__()
+        return NotImplemented
 
     def _add_cache(self, item):
         key, value = item

tests/unit/test_response.py

@@ -128,3 +128,14 @@ def test_hash_diff(self):
         test2 = Record({}, None, endpoint2)
         test2.id = 2
         self.assertNotEqual(hash(test1), hash(test2))
+
+    def test_compare(self):
+        endpoint1 = Mock()
+        endpoint1.name = "test-endpoint"
+        endpoint2 = Mock()
+        endpoint2.name = "test-endpoint"
+        test1 = Record({}, None, endpoint1)
+        test1.id = 1
+        test2 = Record({}, None, endpoint2)
+        test2.id = 1
+        self.assertEqual(test1, test2)