Converted static URL definitions to routers

netbox/circuits/api/urls.py

@@ -1,25 +1,24 @@
-from django.conf.urls import url
+from django.conf.urls import include, url
+
+from rest_framework import routers
 
 from extras.models import GRAPH_TYPE_PROVIDER
 from extras.api.views import GraphListView
 
-from .views import *
+from .views import CircuitViewSet, CircuitTypeViewSet, ProviderViewSet
+
 
+router = routers.DefaultRouter()
+router.register(r'providers', ProviderViewSet)
+router.register(r'circuit-types', CircuitTypeViewSet)
+router.register(r'circuits', CircuitViewSet)
 
 urlpatterns = [
 
+    url(r'', include(router.urls)),
+
     # Providers
-    url(r'^providers/$', ProviderViewSet.as_view({'get': 'list'}), name='provider_list'),
-    url(r'^providers/(?P<pk>\d+)/$', ProviderViewSet.as_view({'get': 'retrieve'}), name='provider_detail'),
     url(r'^providers/(?P<pk>\d+)/graphs/$', GraphListView.as_view(), {'type': GRAPH_TYPE_PROVIDER},
         name='provider_graphs'),
 
-    # Circuit types
-    url(r'^circuit-types/$', CircuitTypeViewSet.as_view({'get': 'list'}), name='circuittype_list'),
-    url(r'^circuit-types/(?P<pk>\d+)/$', CircuitTypeViewSet.as_view({'get': 'retrieve'}), name='circuittype_detail'),
-
-    # Circuits
-    url(r'^circuits/$', CircuitViewSet.as_view({'get': 'list'}), name='circuit_list'),
-    url(r'^circuits/(?P<pk>\d+)/$', CircuitViewSet.as_view({'get': 'retrieve'}), name='circuit_detail'),
-
 ]

netbox/dcim/api/urls.py

@@ -1,50 +1,45 @@
-from django.conf.urls import url
+from django.conf.urls import include, url
+
+from rest_framework import routers
 
 from extras.models import GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE
 from extras.api.views import GraphListView, TopologyMapView
 
-from .views import *
+from .views import (
+
+    # Viewsets
+    ConsolePortViewSet, ConsoleServerPortViewSet, DeviceViewSet, DeviceBayViewSet, DeviceRoleViewSet, DeviceTypeViewSet,
+    InterfaceViewSet, ManufacturerViewSet, ModuleViewSet, PlatformViewSet, PowerPortViewSet, PowerOutletViewSet,
+    RackViewSet, RackGroupViewSet, RackRoleViewSet, SiteViewSet,
+
+    # Legacy views
+    ConsolePortView, InterfaceConnectionView, InterfaceConnectionListView, InterfaceDetailView, PowerPortView,
+    LLDPNeighborsView, RackUnitListView, RelatedConnectionsView,
+)
 
 
+router = routers.DefaultRouter()
+router.register(r'sites', SiteViewSet)
+router.register(r'rack-groups', RackGroupViewSet)
+router.register(r'rack-roles', RackRoleViewSet)
+router.register(r'racks', RackViewSet)
+router.register(r'manufacturers', ManufacturerViewSet)
+router.register(r'device-types', DeviceTypeViewSet)
+router.register(r'device-roles', DeviceRoleViewSet)
+router.register(r'platforms', PlatformViewSet)
+router.register(r'devices', DeviceViewSet)
+
 urlpatterns = [
 
+    url(r'', include(router.urls)),
+
     # Sites
-    url(r'^sites/$', SiteViewSet.as_view({'get': 'list'}), name='site_list'),
-    url(r'^sites/(?P<pk>\d+)/$', SiteViewSet.as_view({'get': 'retrieve'}), name='site_detail'),
     url(r'^sites/(?P<pk>\d+)/graphs/$', GraphListView.as_view(), {'type': GRAPH_TYPE_SITE}, name='site_graphs'),
 
-    # Rack groups
-    url(r'^rack-groups/$', RackGroupViewSet.as_view({'get': 'list'}), name='rackgroup_list'),
-    url(r'^rack-groups/(?P<pk>\d+)/$', RackGroupViewSet.as_view({'get': 'retrieve'}), name='rackgroup_detail'),
-
-    # Rack roles
-    url(r'^rack-roles/$', RackRoleViewSet.as_view({'get': 'list'}), name='rackrole_list'),
-    url(r'^rack-roles/(?P<pk>\d+)/$', RackRoleViewSet.as_view({'get': 'retrieve'}), name='rackrole_detail'),
-
     # Racks
-    url(r'^racks/$', RackViewSet.as_view({'get': 'list'}), name='rack_list'),
-    url(r'^racks/(?P<pk>\d+)/$', RackViewSet.as_view({'get': 'retrieve'}), name='rack_detail'),
     url(r'^racks/(?P<pk>\d+)/rack-units/$', RackUnitListView.as_view(), name='rack_units'),
 
-    # Manufacturers
-    url(r'^manufacturers/$', ManufacturerViewSet.as_view({'get': 'list'}), name='manufacturer_list'),
-    url(r'^manufacturers/(?P<pk>\d+)/$', ManufacturerViewSet.as_view({'get': 'retrieve'}), name='manufacturer_detail'),
-
-    # Device types
-    url(r'^device-types/$', DeviceTypeViewSet.as_view({'get': 'list'}), name='devicetype_list'),
-    url(r'^device-types/(?P<pk>\d+)/$', DeviceTypeViewSet.as_view({'get': 'retrieve'}), name='devicetype_detail'),
-
-    # Device roles
-    url(r'^device-roles/$', DeviceRoleViewSet.as_view({'get': 'list'}), name='devicerole_list'),
-    url(r'^device-roles/(?P<pk>\d+)/$', DeviceRoleViewSet.as_view({'get': 'retrieve'}), name='devicerole_detail'),
-
-    # Platforms
-    url(r'^platforms/$', PlatformViewSet.as_view({'get': 'list'}), name='platform_list'),
-    url(r'^platforms/(?P<pk>\d+)/$', PlatformViewSet.as_view({'get': 'retrieve'}), name='platform_detail'),
-
     # Devices
-    url(r'^devices/$', DeviceViewSet.as_view({'get': 'list'}), name='device_list'),
-    url(r'^devices/(?P<pk>\d+)/$', DeviceViewSet.as_view({'get': 'retrieve'}), name='device_detail'),
     url(r'^devices/(?P<pk>\d+)/lldp-neighbors/$', LLDPNeighborsView.as_view(), name='device_lldp-neighbors'),
     url(r'^devices/(?P<pk>\d+)/console-ports/$', ConsolePortViewSet.as_view({'get': 'list'}), name='device_consoleports'),
     url(r'^devices/(?P<pk>\d+)/console-server-ports/$', ConsoleServerPortViewSet.as_view({'get': 'list'}), name='device_consoleserverports'),
@@ -53,6 +48,7 @@ urlpatterns = [
     url(r'^devices/(?P<pk>\d+)/interfaces/$', InterfaceViewSet.as_view({'get': 'list'}), name='device_interfaces'),
     url(r'^devices/(?P<pk>\d+)/device-bays/$', DeviceBayViewSet.as_view({'get': 'list'}), name='device_devicebays'),
     url(r'^devices/(?P<pk>\d+)/modules/$', ModuleViewSet.as_view({'get': 'list'}), name='device_modules'),
+    # TODO: Services
 
     # Console ports
     url(r'^console-ports/(?P<pk>\d+)/$', ConsolePortView.as_view(), name='consoleport'),

netbox/ipam/api/urls.py

@@ -1,44 +1,26 @@
-from django.conf.urls import url
+from django.conf.urls import include, url
 
-from .views import *
+from rest_framework import routers
 
+from .views import (
+    AggregateViewSet, IPAddressViewSet, PrefixViewSet, RIRViewSet, RoleViewSet, ServiceViewSet, VLANViewSet,
+    VLANGroupViewSet, VRFViewSet,
+)
 
-urlpatterns = [
-
-    # VRFs
-    url(r'^vrfs/$', VRFViewSet.as_view({'get': 'list'}), name='vrf_list'),
-    url(r'^vrfs/(?P<pk>\d+)/$', VRFViewSet.as_view({'get': 'retrieve'}), name='vrf_detail'),
-
-    # Roles
-    url(r'^roles/$', RoleViewSet.as_view({'get': 'list'}), name='role_list'),
-    url(r'^roles/(?P<pk>\d+)/$', RoleViewSet.as_view({'get': 'retrieve'}), name='role_detail'),
-
-    # RIRs
-    url(r'^rirs/$', RIRViewSet.as_view({'get': 'list'}), name='rir_list'),
-    url(r'^rirs/(?P<pk>\d+)/$', RIRViewSet.as_view({'get': 'retrieve'}), name='rir_detail'),
 
-    # Aggregates
-    url(r'^aggregates/$', AggregateViewSet.as_view({'get': 'list'}), name='aggregate_list'),
-    url(r'^aggregates/(?P<pk>\d+)/$', AggregateViewSet.as_view({'get': 'retrieve'}), name='aggregate_detail'),
+router = routers.DefaultRouter()
+router.register(r'vrfs', VRFViewSet)
+router.register(r'rirs', RIRViewSet)
+router.register(r'aggregates', AggregateViewSet)
+router.register(r'roles', RoleViewSet)
+router.register(r'prefixes', PrefixViewSet)
+router.register(r'ip-addresses', IPAddressViewSet)
+router.register(r'vlan-groups', VLANGroupViewSet)
+router.register(r'vlans', VLANViewSet)
+router.register(r'services', ServiceViewSet)
 
-    # Prefixes
-    url(r'^prefixes/$', PrefixViewSet.as_view({'get': 'list'}), name='prefix_list'),
-    url(r'^prefixes/(?P<pk>\d+)/$', PrefixViewSet.as_view({'get': 'retrieve'}), name='prefix_detail'),
-
-    # IP addresses
-    url(r'^ip-addresses/$', IPAddressViewSet.as_view({'get': 'list'}), name='ipaddress_list'),
-    url(r'^ip-addresses/(?P<pk>\d+)/$', IPAddressViewSet.as_view({'get': 'retrieve'}), name='ipaddress_detail'),
-
-    # VLAN groups
-    url(r'^vlan-groups/$', VLANGroupViewSet.as_view({'get': 'list'}), name='vlangroup_list'),
-    url(r'^vlan-groups/(?P<pk>\d+)/$', VLANGroupViewSet.as_view({'get': 'retrieve'}), name='vlangroup_detail'),
-
-    # VLANs
-    url(r'^vlans/$', VLANViewSet.as_view({'get': 'list'}), name='vlan_list'),
-    url(r'^vlans/(?P<pk>\d+)/$', VLANViewSet.as_view({'get': 'retrieve'}), name='vlan_detail'),
+urlpatterns = [
 
-    # Services
-    url(r'^services/$', ServiceViewSet.as_view({'get': 'list'}), name='service_list'),
-    url(r'^services/(?P<pk>\d+)/$', ServiceViewSet.as_view({'get': 'retrieve'}), name='service_detail'),
+    url(r'', include(router.urls)),
 
 ]

netbox/secrets/api/urls.py

@@ -1,13 +1,24 @@
-from django.conf.urls import url
+from django.conf.urls import include, url
 
-from .views import *
+from rest_framework import routers
 
+from .views import (
+
+    # Viewsets
+    SecretRoleViewSet,
+
+    # Legacy views
+    RSAKeyGeneratorView, SecretDetailView, SecretListView,
+
+)
+
+
+router = routers.DefaultRouter()
+router.register(r'secret-roles', SecretRoleViewSet)
 
 urlpatterns = [
 
-    # Secret roles
-    url(r'^secret-roles/$', SecretRoleViewSet.as_view({'get': 'list'}), name='secretrole_list'),
-    url(r'^secret-roles/(?P<pk>\d+)/$', SecretRoleViewSet.as_view({'get': 'retrieve'}), name='secretrole_detail'),
+    url(r'', include(router.urls)),
 
     # Secrets
     url(r'^secrets/$', SecretListView.as_view(), name='secret_list'),

netbox/tenancy/api/urls.py

@@ -1,16 +1,16 @@
-from django.conf.urls import url
+from django.conf.urls import include, url
 
-from .views import *
+from rest_framework import routers
 
+from views import TenantViewSet, TenantGroupViewSet
 
-urlpatterns = [
 
-    # Tenant groups
-    url(r'^tenant-groups/$', TenantGroupViewSet.as_view({'get': 'list'}), name='tenantgroup_list'),
-    url(r'^tenant-groups/(?P<pk>\d+)/$', TenantGroupViewSet.as_view({'get': 'retrieve'}), name='tenantgroup_detail'),
+router = routers.DefaultRouter()
+router.register(r'tenant-groups', TenantGroupViewSet)
+router.register(r'tenants', TenantViewSet)
+
+urlpatterns = [
 
-    # Tenants
-    url(r'^tenants/$', TenantViewSet.as_view({'get': 'list'}), name='tenant_list'),
-    url(r'^tenants/(?P<pk>\d+)/$', TenantViewSet.as_view({'get': 'retrieve'}), name='tenant_detail'),
+    url(r'', include(router.urls)),
 
 ]