Fix for issue #39. Updated exceptions dcim methods.

Author: Thomas

netbox/connection.py

@@ -1,6 +1,7 @@
 import requests
-from netbox import exceptions
 import json
+import urllib.parse
+from netbox import exceptions
 
 
 class NetboxConnection(object):
@@ -67,6 +68,9 @@ def __request(self, method, params=None, key=None, body=None, url=None):
         if not 200 <= response.status_code < 300:
             self.__raise_error(response.status_code, response.content)
 
+        if response.status_code == 204:
+            return response.content
+
         try:
             response_data = response.json()
         except json.JSONDecodeError:
@@ -78,7 +82,7 @@ def get(self, param, key=None, limit=0, **kwargs):
 
         if kwargs:
             url = '{}{}?{}&limit={}'.format(self.base_url, param,
-                                            '&'.join('{}={}'.format(key, val) for key, val in kwargs.items()), limit)
+                                            '&'.join('{}={}'.format(key, urllib.parse.quote(val)) for key, val in kwargs.items()), limit)
         elif key:
             if '_choices' in param:
                 url = '{}{}{}/?limit={}'.format(self.base_url, param, key, limit)
@@ -108,7 +112,6 @@ def post(self, params, required_fields, **kwargs):
 
         if kwargs:
             body_data.update({key: value for (key, value) in kwargs.items()})
-
         resp_data = self.__request('POST', params=params, body=body_data)
 
         return resp_data

netbox/dcim.py

@@ -37,7 +37,7 @@ def delete_region(self, region_name):
         try:
             region_id = self.get_regions(name=region_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('region: {}'.format(region_name)) from None
+            raise exceptions.NotFoundException({"detail": "region: {}".format(region_name)}) from None
         return self.netbox_con.delete('/dcim/regions/', region_id)
 
     def delete_region_by_id(self, region_id):
@@ -58,7 +58,7 @@ def update_region(self, region_name, **kwargs):
         try:
             region_id = self.get_regions(name=region_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('region: {}'.format(region_name)) from None
+            raise exceptions.NotFoundException({"detail": "region: {}".format(region_name)}) from None
         return self.netbox_con.patch('/dcim/regions/', region_id, **kwargs)
 
     def update_region_id(self, region_id, **kwargs):
@@ -94,7 +94,7 @@ def delete_site(self, site_name):
         try:
             site_id = self.get_sites(name=site_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('site: {}'.format(site_name)) from None
+            raise exceptions.NotFoundException({"detail": "site: {}".format(site_name)}) from None
         return self.netbox_con.delete('/dcim/sites/', site_id)
 
     def delete_site_by_id(self, site_id):
@@ -115,7 +115,7 @@ def update_site(self, site_name, **kwargs):
         try:
             site_id = self.get_sites(name=site_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('site: {}'.format(site_name)) from None
+            raise exceptions.NotFoundException({"detail": "site: {}".format(site_name)}) from None
         return self.netbox_con.patch('/dcim/sites/', site_id, **kwargs)
 
     def update_site_by_id(self, site_id, **kwargs):
@@ -142,7 +142,7 @@ def create_rack(self, name, site_name, **kwargs):
         try:
             site_id = self.get_sites(name=site_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('site: {}'.format(site_name)) from None
+            raise exceptions.NotFoundException({"detail": "site: {}".format(site_name)}) from None
         required_fields = {"name": name, "site": site_id}
         return self.netbox_con.post('/dcim/racks/', required_fields, **kwargs)
 
@@ -155,7 +155,7 @@ def delete_rack(self, rack_name):
         try:
             rack_id = self.get_racks(name=rack_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('rack: {}'.format(rack_name)) from None
+            raise exceptions.NotFoundException({"detail": "rack: {}".format(rack_name)}) from None
         return self.netbox_con.delete('/dcim/racks/', rack_id)
 
     def delete_rack_by_id(self, rack_id):
@@ -176,7 +176,7 @@ def update_rack(self, rack_name, **kwargs):
         try:
             rack_id = self.get_racks(facility_id=rack_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('rack: {}'.format(rack_name)) from None
+            raise exceptions.NotFoundException({"detail": "rack: {}".format(rack_name)}) from None
         return self.netbox_con.patch('/dcim/racks/', rack_id, **kwargs)
 
     def update_rack_by_id(self, rack_id, **kwargs):
@@ -204,7 +204,7 @@ def create_rack_group(self, name, slug, site_name, **kwargs):
         try:
             site_id = self.get_sites(name=site_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('site: {}'.format(site_name)) from None
+            raise exceptions.NotFoundException({"detail": "site: {}".format(site_name)}) from None
         required_fields = {"name": name, "slug": slug, "site": site_id}
         return self.netbox_con.post('/dcim/rack-groups/', required_fields, **kwargs)
 
@@ -217,7 +217,7 @@ def delete_rack_group(self, name):
         try:
             rack_group_id = self.get_rack_groups(name=name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('rack-group: {}'.format(name)) from None
+            raise exceptions.NotFoundException({"detail": "rack-group: {}".format(name)}) from None
         return self.netbox_con.delete('/dcim/rack-groups/', rack_group_id)
 
     def delete_rack_group_by_id(self, rack_group_id):
@@ -238,7 +238,7 @@ def update_rack_group(self, name, **kwargs):
         try:
             rack_group_id = self.get_rack_groups(name=name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('rack group: {}'.format(name)) from None
+            raise exceptions.NotFoundException({"detail": "rack group: {}".format(name)}) from None
         return self.netbox_con.patch('/dcim/rack-groups/', rack_group_id, **kwargs)
 
     def update_rack_group_by_id(self, rack_group_id, **kwargs):
@@ -263,7 +263,7 @@ def get_devices_per_rack(self, rack_name, **kwargs):
         try:
             rack_id = self.get_racks(name=rack_name)[0]['id']
         except IndexError:
-            raise exceptions.NotFoundException('rack: {}'.format(rack_name)) from None
+            raise exceptions.NotFoundException({"detail": "rack: {}".format(rack_name)}) from None
         return self.netbox_con.get('/dcim/devices', rack_id=rack_id, **kwargs)
 
     def create_device(self, name, device_role, site_name, device_type, **kwargs):

netbox/exceptions.py

@@ -4,7 +4,7 @@ def __init__(self, resp_data):
             if 'detail' in resp_data:
                 self.err = resp_data['detail']
             else:
-                self.err = ''.join('{} '.format(val) for key, val in resp_data.items())
+                self.err = ''.join('{} '.format(val[0]) for key, val in resp_data.items())
         else:
             self.err = 'Unknown Error, please check the Netbox logs'