Clean up core API imports

netbox/circuits/api/nested_serializers.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
 from circuits.models import *
-from netbox.api import WritableNestedSerializer
+from netbox.api.serializers import WritableNestedSerializer
 
 __all__ = [
     'NestedCircuitSerializer',

netbox/circuits/api/serializers.py

@@ -2,11 +2,11 @@ from rest_framework import serializers
 
 from circuits.choices import CircuitStatusChoices
 from circuits.models import *
-from dcim.api.nested_serializers import NestedCableSerializer, NestedSiteSerializer
+from dcim.api.nested_serializers import NestedSiteSerializer
 from dcim.api.serializers import CabledObjectSerializer
 from ipam.models import ASN
 from ipam.api.nested_serializers import NestedASNSerializer
-from netbox.api import ChoiceField, SerializedPKRelatedField
+from netbox.api.fields import ChoiceField, SerializedPKRelatedField
 from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from .nested_serializers import *

netbox/circuits/api/urls.py

@@ -1,4 +1,4 @@
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
 from . import views
 
 

netbox/dcim/api/serializers.py

@@ -13,7 +13,7 @@ from ipam.api.nested_serializers import (
     NestedVRFSerializer,
 )
 from ipam.models import ASN, VLAN
-from netbox.api import ChoiceField, ContentTypeField, SerializedPKRelatedField
+from netbox.api.fields import ChoiceField, ContentTypeField, SerializedPKRelatedField
 from netbox.api.serializers import (
     GenericObjectSerializer, NestedGroupModelSerializer, NetBoxModelSerializer, ValidatedModelSerializer,
     WritableNestedSerializer,

netbox/dcim/api/urls.py

@@ -1,4 +1,4 @@
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
 from . import views
 
 

netbox/extras/api/nested_serializers.py

@@ -1,8 +1,8 @@
 from rest_framework import serializers
 
 from extras import choices, models
-from netbox.api import ChoiceField, WritableNestedSerializer
+from netbox.api.fields import ChoiceField
-from netbox.api.serializers import NestedTagSerializer
+from netbox.api.serializers import NestedTagSerializer, WritableNestedSerializer
 from users.api.nested_serializers import NestedUserSerializer
 
 __all__ = [

netbox/extras/api/serializers.py

@@ -12,8 +12,8 @@ from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site
 from extras.choices import *
 from extras.models import *
 from extras.utils import FeatureQuery
-from netbox.api import ChoiceField, ContentTypeField, SerializedPKRelatedField
 from netbox.api.exceptions import SerializerNotFound
+from netbox.api.fields import ChoiceField, ContentTypeField, SerializedPKRelatedField
 from netbox.api.serializers import BaseModelSerializer, NetBoxModelSerializer, ValidatedModelSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer, NestedTenantGroupSerializer
 from tenancy.models import Tenant, TenantGroup

netbox/extras/api/urls.py

@@ -1,4 +1,4 @@
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
 from . import views
 
 

netbox/ipam/api/nested_serializers.py

@@ -2,7 +2,7 @@ from rest_framework import serializers
 
 from ipam import models
 from ipam.models.l2vpn import L2VPNTermination, L2VPN
-from netbox.api import WritableNestedSerializer
+from netbox.api.serializers import WritableNestedSerializer
 
 __all__ = [
     'NestedAggregateSerializer',

netbox/ipam/api/serializers.py

@@ -8,7 +8,7 @@ from dcim.api.nested_serializers import NestedDeviceSerializer, NestedSiteSerial
 from ipam.choices import *
 from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS, VLANGROUP_SCOPE_TYPES
 from ipam.models import *
-from netbox.api import ChoiceField, ContentTypeField, SerializedPKRelatedField
+from netbox.api.fields import ChoiceField, ContentTypeField, SerializedPKRelatedField
 from netbox.api.serializers import NetBoxModelSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import get_serializer_for_model

netbox/ipam/api/urls.py

@@ -1,7 +1,6 @@
 from django.urls import path
 
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
-from ipam.models import IPRange, Prefix
 from . import views
 
 

netbox/netbox/api/__init__.py

@@ -1,15 +0,0 @@
-from .fields import *
-from .routers import NetBoxRouter
-from .serializers import BulkOperationSerializer, ValidatedModelSerializer, WritableNestedSerializer
-
-
-__all__ = (
-    'BulkOperationSerializer',
-    'ChoiceField',
-    'ContentTypeField',
-    'IPNetworkSerializer',
-    'NetBoxRouter',
-    'SerializedPKRelatedField',
-    'ValidatedModelSerializer',
-    'WritableNestedSerializer',
-)

netbox/netbox/api/metadata.py

@@ -5,7 +5,7 @@ from rest_framework import exceptions
 from rest_framework.metadata import SimpleMetadata
 from rest_framework.request import clone_request
 
-from netbox.api import ContentTypeField
+from netbox.api.fields import ContentTypeField
 
 
 class BulkOperationMetadata(SimpleMetadata):

netbox/tenancy/api/nested_serializers.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from netbox.api import WritableNestedSerializer
+from netbox.api.serializers import WritableNestedSerializer
 from tenancy.models import *
 
 __all__ = [

netbox/tenancy/api/serializers.py

@@ -2,7 +2,7 @@ from django.contrib.auth.models import ContentType
 from drf_yasg.utils import swagger_serializer_method
 from rest_framework import serializers
 
-from netbox.api import ChoiceField, ContentTypeField
+from netbox.api.fields import ChoiceField, ContentTypeField
 from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer
 from tenancy.choices import ContactPriorityChoices
 from tenancy.models import *

netbox/tenancy/api/urls.py

@@ -1,4 +1,4 @@
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
 from . import views
 
 

netbox/users/api/nested_serializers.py

@@ -2,7 +2,8 @@ from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
 from rest_framework import serializers
 
-from netbox.api import ContentTypeField, WritableNestedSerializer
+from netbox.api.fields import ContentTypeField
+from netbox.api.serializers import WritableNestedSerializer
 from users.models import ObjectPermission, Token
 
 __all__ = [

netbox/users/api/serializers.py

@@ -2,7 +2,8 @@ from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
 from rest_framework import serializers
 
-from netbox.api import ContentTypeField, IPNetworkSerializer, SerializedPKRelatedField, ValidatedModelSerializer
+from netbox.api.fields import ContentTypeField, IPNetworkSerializer, SerializedPKRelatedField
+from netbox.api.serializers import ValidatedModelSerializer
 from users.models import ObjectPermission, Token
 from .nested_serializers import *
 

netbox/users/api/urls.py

@@ -1,6 +1,6 @@
 from django.urls import include, path
 
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
 from . import views
 
 

netbox/utilities/custom_inspectors.py

@@ -6,7 +6,8 @@ from rest_framework.fields import ChoiceField
 from rest_framework.relations import ManyRelatedField
 
 from extras.api.customfields import CustomFieldsDataField
-from netbox.api import ChoiceField, SerializedPKRelatedField, WritableNestedSerializer
+from netbox.api.fields import ChoiceField, SerializedPKRelatedField
+from netbox.api.serializers import WritableNestedSerializer
 
 
 class NetBoxSwaggerAutoSchema(SwaggerAutoSchema):

netbox/virtualization/api/nested_serializers.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from netbox.api import WritableNestedSerializer
+from netbox.api.serializers import WritableNestedSerializer
 from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 __all__ = [

netbox/virtualization/api/serializers.py

@@ -9,7 +9,7 @@ from ipam.api.nested_serializers import (
     NestedIPAddressSerializer, NestedL2VPNTerminationSerializer, NestedVLANSerializer, NestedVRFSerializer,
 )
 from ipam.models import VLAN
-from netbox.api import ChoiceField, SerializedPKRelatedField
+from netbox.api.fields import ChoiceField, SerializedPKRelatedField
 from netbox.api.serializers import NetBoxModelSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from virtualization.choices import *

netbox/virtualization/api/urls.py

@@ -1,4 +1,4 @@
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
 from . import views
 
 

netbox/wireless/api/nested_serializers.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from netbox.api import WritableNestedSerializer
+from netbox.api.serializers import WritableNestedSerializer
 from wireless.models import *
 
 __all__ = (

netbox/wireless/api/serializers.py

@@ -3,7 +3,7 @@ from rest_framework import serializers
 from dcim.choices import LinkStatusChoices
 from dcim.api.serializers import NestedInterfaceSerializer
 from ipam.api.serializers import NestedVLANSerializer
-from netbox.api import ChoiceField
+from netbox.api.fields import ChoiceField
 from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from wireless.choices import *

netbox/wireless/api/urls.py

@@ -1,4 +1,4 @@
-from netbox.api import NetBoxRouter
+from netbox.api.routers import NetBoxRouter
 from . import views