From 06e5966cb41f17a78096569b6883038e676214e1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 1 Feb 2017 15:09:23 -0500
Subject: [PATCH] Include API routers directly where possible

---
 netbox/circuits/api/urls.py | 8 --------
 netbox/ipam/api/urls.py     | 8 --------
 netbox/netbox/urls.py       | 9 ++++++---
 netbox/tenancy/api/urls.py  | 8 --------
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/netbox/circuits/api/urls.py b/netbox/circuits/api/urls.py
index 6bb49dc38..b104be594 100644
--- a/netbox/circuits/api/urls.py
+++ b/netbox/circuits/api/urls.py
@@ -1,5 +1,3 @@
-from django.conf.urls import include, url
-
 from rest_framework import routers
 
 from . import views
@@ -10,9 +8,3 @@ router.register(r'providers', views.ProviderViewSet)
 router.register(r'circuit-types', views.CircuitTypeViewSet)
 router.register(r'circuits', views.CircuitViewSet)
 router.register(r'circuit-terminations', views.CircuitTerminationViewSet)
-
-urlpatterns = [
-
-    url(r'', include(router.urls)),
-
-]
diff --git a/netbox/ipam/api/urls.py b/netbox/ipam/api/urls.py
index 24c97b341..e084c9287 100644
--- a/netbox/ipam/api/urls.py
+++ b/netbox/ipam/api/urls.py
@@ -1,5 +1,3 @@
-from django.conf.urls import include, url
-
 from rest_framework import routers
 
 from . import views
@@ -15,9 +13,3 @@ router.register(r'ip-addresses', views.IPAddressViewSet)
 router.register(r'vlan-groups', views.VLANGroupViewSet)
 router.register(r'vlans', views.VLANViewSet)
 router.register(r'services', views.ServiceViewSet)
-
-urlpatterns = [
-
-    url(r'', include(router.urls)),
-
-]
diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py
index eb6b67fe7..3b1d7b569 100644
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -2,8 +2,11 @@ from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
 
+from circuits.api.urls import router as circuits_router
+from ipam.api.urls import router as ipam_router
 from netbox.views import home, handle_500, trigger_500
 from users.views import login, logout
+from tenancy.api.urls import router as tenancy_router
 
 
 handler500 = handle_500
@@ -26,11 +29,11 @@ _patterns = [
     url(r'^profile/', include('users.urls', namespace='users')),
 
     # API
-    url(r'^api/circuits/', include('circuits.api.urls', namespace='circuits-api')),
+    url(r'^api/circuits/', include(circuits_router.urls, namespace='circuits-api')),
     url(r'^api/dcim/', include('dcim.api.urls', namespace='dcim-api')),
-    url(r'^api/ipam/', include('ipam.api.urls', namespace='ipam-api')),
+    url(r'^api/ipam/', include(ipam_router.urls, namespace='ipam-api')),
     url(r'^api/secrets/', include('secrets.api.urls', namespace='secrets-api')),
-    url(r'^api/tenancy/', include('tenancy.api.urls', namespace='tenancy-api')),
+    url(r'^api/tenancy/', include(tenancy_router.urls, namespace='tenancy-api')),
     url(r'^api/docs/', include('rest_framework_swagger.urls')),
     url(r'^api-auth/', include('rest_framework.urls')),
 
diff --git a/netbox/tenancy/api/urls.py b/netbox/tenancy/api/urls.py
index 35e11cd6b..483f54d23 100644
--- a/netbox/tenancy/api/urls.py
+++ b/netbox/tenancy/api/urls.py
@@ -1,5 +1,3 @@
-from django.conf.urls import include, url
-
 from rest_framework import routers
 
 from . import views
@@ -8,9 +6,3 @@ from . import views
 router = routers.DefaultRouter()
 router.register(r'tenant-groups', views.TenantGroupViewSet)
 router.register(r'tenants', views.TenantViewSet)
-
-urlpatterns = [
-
-    url(r'', include(router.urls)),
-
-]