Browse Source

Rearranged URL namespaces to satisfy deprecation warnings

Jeremy Stretch 8 years ago
parent
commit
369d3aa62e

+ 1 - 0
netbox/circuits/api/urls.py

@@ -22,4 +22,5 @@ router.register(r'circuit-types', views.CircuitTypeViewSet)
 router.register(r'circuits', views.CircuitViewSet)
 router.register(r'circuit-terminations', views.CircuitTerminationViewSet)
 
+app_name = 'circuits-api'
 urlpatterns = router.urls

+ 1 - 0
netbox/circuits/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from . import views
 
 
+app_name = 'circuits'
 urlpatterns = [
 
     # Providers

+ 1 - 0
netbox/dcim/api/urls.py

@@ -58,4 +58,5 @@ router.register(r'interface-connections', views.InterfaceConnectionViewSet)
 # Miscellaneous
 router.register(r'connected-device', views.ConnectedDeviceViewSet, base_name='connected-device')
 
+app_name = 'dcim-api'
 urlpatterns = router.urls

+ 1 - 0
netbox/dcim/urls.py

@@ -8,6 +8,7 @@ from .models import Device, Rack, Site
 from . import views
 
 
+app_name = 'dcim'
 urlpatterns = [
 
     # Regions

+ 1 - 0
netbox/extras/api/urls.py

@@ -29,4 +29,5 @@ router.register(r'image-attachments', views.ImageAttachmentViewSet)
 # Recent activity
 router.register(r'recent-activity', views.RecentActivityViewSet)
 
+app_name = 'extras-api'
 urlpatterns = router.urls

+ 1 - 0
netbox/extras/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from extras import views
 
 
+app_name = 'extras'
 urlpatterns = [
 
     # Image attachments

+ 1 - 0
netbox/ipam/api/urls.py

@@ -37,4 +37,5 @@ router.register(r'vlans', views.VLANViewSet)
 # Services
 router.register(r'services', views.ServiceViewSet)
 
+app_name = 'ipam-api'
 urlpatterns = router.urls

+ 1 - 0
netbox/ipam/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from . import views
 
 
+app_name = 'ipam'
 urlpatterns = [
 
     # VRFs

+ 14 - 14
netbox/netbox/urls.py

@@ -20,22 +20,22 @@ _patterns = [
     url(r'^logout/$', logout, name='logout'),
 
     # Apps
-    url(r'^circuits/', include('circuits.urls', namespace='circuits')),
-    url(r'^dcim/', include('dcim.urls', namespace='dcim')),
-    url(r'^extras/', include('extras.urls', namespace='extras')),
-    url(r'^ipam/', include('ipam.urls', namespace='ipam')),
-    url(r'^secrets/', include('secrets.urls', namespace='secrets')),
-    url(r'^tenancy/', include('tenancy.urls', namespace='tenancy')),
-    url(r'^user/', include('users.urls', namespace='user')),
+    url(r'^circuits/', include('circuits.urls')),
+    url(r'^dcim/', include('dcim.urls')),
+    url(r'^extras/', include('extras.urls')),
+    url(r'^ipam/', include('ipam.urls')),
+    url(r'^secrets/', include('secrets.urls')),
+    url(r'^tenancy/', include('tenancy.urls')),
+    url(r'^user/', include('users.urls')),
 
     # API
     url(r'^api/$', APIRootView.as_view(), name='api-root'),
-    url(r'^api/circuits/', include('circuits.api.urls', namespace='circuits-api')),
-    url(r'^api/dcim/', include('dcim.api.urls', namespace='dcim-api')),
-    url(r'^api/extras/', include('extras.api.urls', namespace='extras-api')),
-    url(r'^api/ipam/', include('ipam.api.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/circuits/', include('circuits.api.urls')),
+    url(r'^api/dcim/', include('dcim.api.urls')),
+    url(r'^api/extras/', include('extras.api.urls')),
+    url(r'^api/ipam/', include('ipam.api.urls')),
+    url(r'^api/secrets/', include('secrets.api.urls')),
+    url(r'^api/tenancy/', include('tenancy.api.urls')),
     url(r'^api/docs/', include('rest_framework_swagger.urls')),
 
     # Serving static media in Django to pipe it through LoginRequiredMiddleware
@@ -45,7 +45,7 @@ _patterns = [
     url(r'^500/$', trigger_500),
 
     # Admin
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
 ]
 

+ 1 - 0
netbox/secrets/api/urls.py

@@ -22,4 +22,5 @@ router.register(r'secrets', views.SecretViewSet)
 router.register(r'get-session-key', views.GetSessionKeyViewSet, base_name='get-session-key')
 router.register(r'generate-rsa-key-pair', views.GenerateRSAKeyPairViewSet, base_name='generate-rsa-key-pair')
 
+app_name = 'secrets-api'
 urlpatterns = router.urls

+ 1 - 0
netbox/secrets/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from . import views
 
 
+app_name = 'secrets'
 urlpatterns = [
 
     # Secret roles

+ 1 - 0
netbox/tenancy/api/urls.py

@@ -18,4 +18,5 @@ router.APIRootView = TenancyRootView
 router.register(r'tenant-groups', views.TenantGroupViewSet)
 router.register(r'tenants', views.TenantViewSet)
 
+app_name = 'tenancy-api'
 urlpatterns = router.urls

+ 1 - 0
netbox/tenancy/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from . import views
 
 
+app_name = 'tenancy'
 urlpatterns = [
 
     # Tenant groups

+ 1 - 0
netbox/users/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from . import views
 
 
+app_name = 'user'
 urlpatterns = [
 
     url(r'^profile/$', views.profile, name='profile'),