Merge pull request #195 from telekom-mms/fix/api-filter

fix: fixing not working fortigate api filters on get requests

Author: neubi4

fortilib/fortigateapi.py

@@ -715,10 +715,13 @@ def does_exist(self, object_url: str) -> bool:
             return True
         return False
 
-    def get(self, url):
+    def get(self, url, params: Optional[dict] = None):
+        params = params or dict()
+        params.update(vdom=self.vdom)
+
         return self.client.get(
             url,
-            params=f"vdom={self.vdom}",
+            params=params,
         )
 
     def put(self, url, data: Dict):
@@ -771,16 +774,18 @@ def query_api_get(
         self, uri: str, specific=False, filters=False
     ) -> Union[dict, int]:
         api_url = self.urlbase + uri
+        params = dict()
+
         if specific:
             api_url += specific
         if filters:
-            api_url += "?filter=" + filters
+            params.update(filter=filters)
 
         self.operations.append(
             FortiGateOperation(api_url, FortiGateQueryType.GET, "", "")
         )
 
-        result = self.get(api_url)
+        result = self.get(api_url, params)
         self.check_response_code(result)
         return result.json()["results"]
 

tests/tests_fortilib_firewall_read/test_fortilib_firewall.py

@@ -53,7 +53,7 @@ def test_query_api_get(self):
         )
 
         fortigate_api.client.get.assert_called_once_with(
-            "https://127.0.0.1:443/api/v2/cmdb/firewall/policy/1/?filter=skip=1",
-            params="vdom=root",
+            "https://127.0.0.1:443/api/v2/cmdb/firewall/policy/1/",
+            params={'filter': 'skip=1', 'vdom': 'root'},
         )
         self.assertEqual("test result", result)