Using urljoin and fixing comments

Author: johannwagner

cosmo/clients/netbox.py

@@ -1,4 +1,5 @@
 import time
+from urllib.parse import urljoin
 
 import requests
 
@@ -21,7 +22,7 @@ def __init__(self, url, token):
 
     def query_version(self):
         r = requests.get(
-            f"{self.url}/api/status/",
+            urljoin(self.url, "/api/status/"),
             headers={
                 "Authorization": f"Token {self.token}",
                 "Content-Type": "application/json",

cosmo/clients/netbox_client.py

@@ -1,4 +1,4 @@
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urljoin
 
 import requests
 
@@ -10,7 +10,7 @@ def __init__(self, url, token):
 
     def query(self, query):
         r = requests.post(
-            f"{self.url}/graphql/",
+            urljoin(self.url, "/graphql/"),
             json={"query": query},
             headers={
                 "Authorization": f"Token {self.token}",
@@ -31,7 +31,7 @@ def query(self, query):
 
     def query_rest(self, path, queries):
         q = urlencode(queries, doseq=True)
-        url = f"{self.url}/{path}?{q}"
+        url = urljoin(self.url, path) + f"?{q}",
 
         return_array = list()
 

cosmo/clients/netbox_v4.py

@@ -78,7 +78,9 @@ def _merge_into(self, data: dict, query_data):
 
 class LoopbackDataQuery(ParallelQuery):
     def _fetch_data(self, kwargs):
-        # Note: This does not use the device list, because we can have other devices, which are not
+        # Note: This does not use the device list, because we can have other participating devices
+        # which are not in the same repository and thus are not appearing in device list.
+
         query_template = Template('''
             query{
               interface_list(filters: {