#6732 - Fix imports and other small items

netbox/dcim/graphql/types.py

@@ -5,7 +5,7 @@ from extras.graphql.mixins import (
     ChangelogMixin, ConfigContextMixin, CustomFieldsMixin, ImageAttachmentsMixin, TagsMixin,
 )
 from ipam.graphql.mixins import IPAddressesMixin, VLANGroupsMixin
-from ipam.graphql.scalars import ASNField
+from netbox.graphql.scalars import BigInt
 from netbox.graphql.types import BaseObjectType, OrganizationalObjectType, PrimaryObjectType
 
 __all__ = (
@@ -383,7 +383,7 @@ class RegionType(VLANGroupsMixin, OrganizationalObjectType):
 
 
 class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, PrimaryObjectType):
-    asn = graphene.Field(ASNField)
+    asn = graphene.Field(BigInt)
 
     class Meta:
         model = models.Site

netbox/dcim/tests/test_filtersets.py

@@ -4,7 +4,7 @@ from django.test import TestCase
 from dcim.choices import *
 from dcim.filtersets import *
 from dcim.models import *
-from ipam.models import IPAddress, RIR, ASN
+from ipam.models import ASN, IPAddress, RIR
 from tenancy.models import Tenant, TenantGroup
 from utilities.choices import ColorChoices
 from utilities.testing import ChangeLoggedFilterSetTests

netbox/dcim/tests/test_views.py

@@ -11,7 +11,7 @@ from netaddr import EUI
 from dcim.choices import *
 from dcim.constants import *
 from dcim.models import *
-from ipam.models import VLAN, ASN, RIR
+from ipam.models import ASN, VLAN, RIR
 from tenancy.models import Tenant
 from utilities.testing import ViewTestCases, create_tags, create_test_device
 

netbox/dcim/views.py

@@ -14,7 +14,7 @@ from django.views.generic import View
 
 from circuits.models import Circuit
 from extras.views import ObjectChangeLogView, ObjectConfigContextView, ObjectJournalView
-from ipam.models import IPAddress, Prefix, Service, VLAN, ASN
+from ipam.models import ASN, IPAddress, Prefix, Service, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from netbox.views import generic
 from utilities.forms import ConfirmationForm

netbox/ipam/api/serializers.py

@@ -19,8 +19,6 @@ from .nested_serializers import *
 #
 # ASNs
 #
-from ..models import ASN
-
 
 class ASNSerializer(PrimaryModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='ipam-api:asn-detail')

netbox/ipam/api/views.py

@@ -7,7 +7,6 @@ from ipam.models import *
 from netbox.api.views import ModelViewSet
 from utilities.utils import count_related
 from . import mixins, serializers
-from ..models import ASN
 
 
 class IPAMRootView(APIRootView):

netbox/ipam/filtersets.py

@@ -33,8 +33,6 @@ __all__ = (
     'VRFFilterSet',
 )
 
-from .models import ASN
-
 
 class VRFFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
     q = django_filters.CharFilter(

netbox/ipam/forms/bulk_import.py

@@ -1,13 +1,11 @@
 from django import forms
 from django.contrib.contenttypes.models import ContentType
-from django.forms import IntegerField
 
 from dcim.models import Device, Interface, Site
 from extras.forms import CustomFieldModelCSVForm
 from ipam.choices import *
 from ipam.constants import *
 from ipam.models import *
-from ipam.models import ASN
 from tenancy.models import Tenant
 from utilities.forms import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField
 from virtualization.models import VirtualMachine, VMInterface
@@ -84,7 +82,6 @@ class AggregateCSVForm(CustomFieldModelCSVForm):
 
 
 class ASNCSVForm(CustomFieldModelCSVForm):
-    asn = IntegerField()
     rir = CSVModelChoiceField(
         queryset=RIR.objects.all(),
         to_field_name='name',

netbox/ipam/graphql/scalars.py

@@ -1,5 +0,0 @@
-from netbox.graphql.scalars import BigInt
-
-
-class ASNField(BigInt):
-    pass

netbox/ipam/graphql/types.py

@@ -1,7 +1,7 @@
 import graphene
 
 from ipam import filtersets, models
-from ipam.graphql.scalars import ASNField
+from netbox.graphql.scalars import BigInt
 from netbox.graphql.types import OrganizationalObjectType, PrimaryObjectType
 
 __all__ = (
@@ -21,7 +21,7 @@ __all__ = (
 
 
 class ASNType(PrimaryObjectType):
-    asn = graphene.Field(ASNField)
+    asn = graphene.Field(BigInt)
 
     class Meta:
         model = models.ASN

netbox/ipam/tables/ip.py

@@ -2,7 +2,6 @@ import django_tables2 as tables
 from django.utils.safestring import mark_safe
 from django_tables2.utils import Accessor
 
-from ipam.models import ASN
 from tenancy.tables import TenantColumn
 from utilities.tables import (
     BaseTable, BooleanColumn, ButtonsColumn, ChoiceFieldColumn, LinkedCountColumn, TagColumn,
@@ -99,7 +98,7 @@ class RIRTable(BaseTable):
 
 
 #
-# RIRs
+# ASNs
 #
 
 class ASNTable(BaseTable):
@@ -112,7 +111,6 @@ class ASNTable(BaseTable):
         url_params={'asn_id': 'pk'},
         verbose_name='Sites'
     )
-
     actions = ButtonsColumn(ASN)
 
     class Meta(BaseTable.Meta):