Merge branch 'dev'

Fixes #2
Mappers were not doing the correct request for GET and PUT

Author: Anthony Ruhier

netboxapi/mapper.py

@@ -37,11 +37,16 @@ def get(self, *args, **kwargs):
         else:
             route = self._route
 
-        new_mappers_dict = self.netbox_api.get(route, data=kwargs)
+        new_mappers_dict = self.netbox_api.get(route, params=kwargs)
+        if "results" in new_mappers_dict:
+            new_mappers_dict = new_mappers_dict["results"]
+
         if isinstance(new_mappers_dict, dict):
             new_mappers_dict = [new_mappers_dict]
         for d in new_mappers_dict:
-            yield self._build_new_mapper_from(d, route)
+            yield self._build_new_mapper_from(
+                d, route + "{}/".format(d["id"])
+            )
 
     def post(self, **json):
         """

setup.cfg

@@ -1,11 +1,18 @@
+[bumpversion]
+current_version = 1.0.1
+commit = True
+tag = True
+tag_name = {new_version}
+
+[bumpversion:file:setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"
+
 [aliases]
-test=pytest
-# verbose mode
-testv=pytest --addopts "-v --duration=10"
-# test debug, with pdb
-testd=pytest --addopts "--pdb"
-# last failed
-testlf=pytest --addopts "--lf"
-# coverage related tests
-testcov=pytest --addopts "--cov netboxapi --cov-config .coveragerc"
-testcoveralls=pytest --addopts "--cov netboxapi --cov-report="
+test = pytest
+testv = pytest --addopts "-v --duration=10"
+testd = pytest --addopts "--pdb"
+testlf = pytest --addopts "--lf"
+testcov = pytest --addopts "--cov netboxapi --cov-config .coveragerc"
+testcoveralls = pytest --addopts "--cov netboxapi --cov-report="
+

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name="netboxapi",
-    version="1.0.0",
+    version="1.0.1",
 
     description="Client API for Netbox",
 

tests/test_mapper.py

@@ -18,27 +18,52 @@ def mapper(self):
 
     def test_get(self, mapper):
         url = self.get_mapper_url(mapper)
-        expected_attr = {"id": 1, "name": "test"}
+        expected_attr = {
+            "count": 1, "next": None, "previous": None,
+            "results": [{"id": 1, "name": "test"}]
+        }
         with requests_mock.Mocker() as m:
             m.register_uri("get", url, json=expected_attr)
             child_mapper = next(mapper.get())
 
-        for key, val in expected_attr.items():
+        for key, val in expected_attr["results"][0].items():
             assert getattr(child_mapper, key) == val
 
     def test_get_submodel(self, mapper):
         url = self.get_mapper_url(mapper)
-        expected_attr = {"id": 1, "name": "first_model"}
+        expected_attr = {
+            "count": 1, "next": None, "previous": None,
+            "results": [{"id": 1, "name": "first_model"}]
+        }
 
         with requests_mock.Mocker() as m:
-            m.register_uri("get", url, json={"id": 1, })
+            m.register_uri(
+                "get", url,
+                json={
+                    "count": 1, "next": None, "previous": None,
+                    "results": [{"id": 1}]
+                }
+            )
             parent_mapper = next(mapper.get())
-            m.register_uri("get", url + "submodel/", json=expected_attr)
+            m.register_uri(
+                "get", url + "{}/{}/".format(parent_mapper.id, "submodel"),
+                json=expected_attr
+            )
             submodel_mapper = next(parent_mapper.get("submodel"))
 
-        for key, val in expected_attr.items():
+        for key, val in expected_attr["results"][0].items():
             assert getattr(submodel_mapper, key) == val
 
+    def test_get_query(self, mapper):
+        url = self.get_mapper_url(mapper) + "?name=test"
+        expected_attr = {
+            "count": 1, "next": None, "previous": None,
+            "results": [{"id": 1, "name": "test"}]
+        }
+        with requests_mock.Mocker() as m:
+            m.register_uri("get", url, json=expected_attr)
+            next(mapper.get(name="test"))
+
     def test_post(self, mapper):
         url = self.get_mapper_url(mapper)
 
@@ -53,7 +78,7 @@ def test_post(self, mapper):
 
     def test_put(self, mapper):
         child_mapper = self.get_child_mapper(mapper)
-        url = self.get_mapper_url(child_mapper)
+        url = self.get_mapper_url(child_mapper) + "{}/".format(child_mapper.id)
         with requests_mock.Mocker() as m:
             received_req = m.register_uri(
                 "put", url, json=self.update_or_create_resource_json_callback
@@ -70,7 +95,10 @@ def update_or_create_resource_json_callback(self, request, context):
 
     def get_child_mapper(self, mapper):
         url = self.get_mapper_url(mapper)
-        expected_attr = {"id": 1, "name": "test"}
+        expected_attr = {
+            "count": 1, "next": None, "previous": None,
+            "results": [{"id": 1, "name": "test"}]
+        }
         with requests_mock.Mocker() as m:
             m.register_uri("get", url, json=expected_attr)
             child_mapper = next(mapper.get())
@@ -93,11 +121,13 @@ def test_delete_from_child(self, mapper):
         url = self.get_mapper_url(mapper) + "1/"
 
         with requests_mock.Mocker() as m:
-            m.register_uri("get", url, json={"id": 1, })
+            m.register_uri(
+                "get", url, json={"id": 1}
+            )
             obj_mapper = next(mapper.get(1))
 
         with requests_mock.Mocker() as m:
-            m.register_uri("delete", url)
+            m.register_uri("delete", url + "1/")
             response = obj_mapper.delete()
 
         assert response.status_code == 200
@@ -106,7 +136,9 @@ def test_delete_other_id_from_child(self, mapper):
         url = self.get_mapper_url(mapper) + "1/"
 
         with requests_mock.Mocker() as m:
-            m.register_uri("get", url, json={"id": 1, })
+            m.register_uri(
+                "get", url, json={"id": 1}
+            )
             obj_mapper = next(mapper.get(1))
 
         with pytest.raises(ForbiddenAsChildError):