From 369d3aa62e3c7d5b601bacedb5212343f145c758 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 5 Apr 2017 14:26:33 -0400 Subject: [PATCH] Rearranged URL namespaces to satisfy deprecation warnings --- netbox/circuits/api/urls.py | 1 + netbox/circuits/urls.py | 1 + netbox/dcim/api/urls.py | 1 + netbox/dcim/urls.py | 1 + netbox/extras/api/urls.py | 1 + netbox/extras/urls.py | 1 + netbox/ipam/api/urls.py | 1 + netbox/ipam/urls.py | 1 + netbox/netbox/urls.py | 28 ++++++++++++++-------------- netbox/secrets/api/urls.py | 1 + netbox/secrets/urls.py | 1 + netbox/tenancy/api/urls.py | 1 + netbox/tenancy/urls.py | 1 + netbox/users/urls.py | 1 + 14 files changed, 27 insertions(+), 14 deletions(-) diff --git a/netbox/circuits/api/urls.py b/netbox/circuits/api/urls.py index 4957a7e73..dfe0624e8 100644 --- a/netbox/circuits/api/urls.py +++ b/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 diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 7dd00b268..b23f21a88 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import url from . import views +app_name = 'circuits' urlpatterns = [ # Providers diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index c7177aa8b..db537e0b7 100644 --- a/netbox/dcim/api/urls.py +++ b/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 diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 7e9f680de..f7c53f1be 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -8,6 +8,7 @@ from .models import Device, Rack, Site from . import views +app_name = 'dcim' urlpatterns = [ # Regions diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py index 85ed93a24..0f4bc2874 100644 --- a/netbox/extras/api/urls.py +++ b/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 diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index 6e0e91a0d..635c9edb4 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import url from extras import views +app_name = 'extras' urlpatterns = [ # Image attachments diff --git a/netbox/ipam/api/urls.py b/netbox/ipam/api/urls.py index cc37b651a..b3e559675 100644 --- a/netbox/ipam/api/urls.py +++ b/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 diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index 5ef052b37..51ce4f524 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import url from . import views +app_name = 'ipam' urlpatterns = [ # VRFs diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index 8e4b5918d..63fb978a8 100644 --- a/netbox/netbox/urls.py +++ b/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), ] diff --git a/netbox/secrets/api/urls.py b/netbox/secrets/api/urls.py index 18c7ec4c1..5f60a8a06 100644 --- a/netbox/secrets/api/urls.py +++ b/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 diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py index b6751617d..a4d3b7a78 100644 --- a/netbox/secrets/urls.py +++ b/netbox/secrets/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import url from . import views +app_name = 'secrets' urlpatterns = [ # Secret roles diff --git a/netbox/tenancy/api/urls.py b/netbox/tenancy/api/urls.py index bedabf67d..f14d39126 100644 --- a/netbox/tenancy/api/urls.py +++ b/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 diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py index 48819f675..b3ca2ecc2 100644 --- a/netbox/tenancy/urls.py +++ b/netbox/tenancy/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import url from . import views +app_name = 'tenancy' urlpatterns = [ # Tenant groups diff --git a/netbox/users/urls.py b/netbox/users/urls.py index 6ec8e21ba..ab714f49b 100644 --- a/netbox/users/urls.py +++ b/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'),