Merge pull request #345 from digitalocean/fix-threaded-returns

Fix threaded returns

Author: Zach Moody

pynetbox/core/query.py

@@ -130,7 +130,7 @@ def __init__(
         base,
         http_session,
         filters=None,
-        limit=0,
+        limit=None,
         key=None,
         token=None,
         private_key=None,
@@ -307,6 +307,8 @@ def get(self, add_params=None):
             endpoint.
         """
 
+        if not add_params and self.limit is not None:
+            add_params = {"limit": self.limit}
         req = self._make_call(add_params=add_params)
         if isinstance(req, dict) and req.get("results") is not None:
             self.count = req["count"]
@@ -323,7 +325,8 @@ def get(self, add_params=None):
                         ret.extend(req["results"])
                     else:
                         self.concurrent_get(ret, page_size, page_offsets)
-                return ret
+                for i in ret:
+                    yield i
             first_run = True
             for i in req["results"]:
                 yield i

tests/test_circuits.py

@@ -34,7 +34,7 @@ def test_get_all(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={},
+                    params={"limit": 0},
                     json=None,
                     headers=HEADERS,
                 )
@@ -51,7 +51,7 @@ def test_filter(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={"name": "test"},
+                    params={"name": "test", "limit": 0},
                     json=None,
                     headers=HEADERS,
                 )

tests/test_tenancy.py

@@ -35,7 +35,7 @@ def test_get_all(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={},
+                    params={"limit": 0},
                     json=None,
                     headers=HEADERS,
                 )
@@ -52,7 +52,7 @@ def test_filter(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={"name": "test"},
+                    params={"name": "test", "limit": 0},
                     json=None,
                     headers=HEADERS,
                 )

tests/test_users.py

@@ -35,7 +35,7 @@ def test_get_all(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={},
+                    params={"limit": 0},
                     json=None,
                     headers=HEADERS,
                 )
@@ -52,7 +52,7 @@ def test_filter(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={"name": "test"},
+                    params={"name": "test", "limit": 0},
                     json=None,
                     headers=HEADERS,
                 )

tests/test_virtualization.py

@@ -35,7 +35,7 @@ def test_get_all(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={},
+                    params={"limit": 0},
                     json=None,
                     headers=HEADERS,
                 )
@@ -52,7 +52,7 @@ def test_filter(self):
                     "http://localhost:8000/api/{}/{}/".format(
                         self.app, self.name.replace("_", "-")
                     ),
-                    params={"name": "test"},
+                    params={"name": "test", "limit": 0},
                     json=None,
                     headers=HEADERS,
                 )