Rearranged URL namespaces to satisfy deprecation warnings

This commit is contained in:
Jeremy Stretch 2017-04-05 14:26:33 -04:00
parent d4ac6dbfe4
commit 369d3aa62e
14 changed files with 27 additions and 14 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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'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') router.register(r'generate-rsa-key-pair', views.GenerateRSAKeyPairViewSet, base_name='generate-rsa-key-pair')
app_name = 'secrets-api'
urlpatterns = router.urls urlpatterns = router.urls

View File

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

View File

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

View File

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

View File

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