Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion netbox_lifecycle/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ def ready(self):

super().ready()

from django.contrib.contenttypes.fields import GenericRelation
from dcim.models import DeviceType, ModuleType
from django.contrib.contenttypes.fields import GenericRelation

from netbox_lifecycle.models import HardwareLifecycle

# Add Generic Relations to appropriate models
Expand Down
8 changes: 4 additions & 4 deletions netbox_lifecycle/api/_serializers/contract.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from rest_framework import serializers

from dcim.api.serializers_.devices import DeviceSerializer, ModuleSerializer
from dcim.api.serializers_.manufacturers import ManufacturerSerializer
from netbox.api.serializers import NetBoxModelSerializer
from rest_framework import serializers
from virtualization.api.serializers_.virtualmachines import VirtualMachineSerializer

from netbox_lifecycle.api._serializers.license import LicenseAssignmentSerializer
from netbox_lifecycle.api._serializers.vendor import VendorSerializer
from netbox_lifecycle.models import (
Expand All @@ -13,9 +13,9 @@
)

__all__ = (
'SupportSKUSerializer',
'SupportContractSerializer',
'SupportContractAssignmentSerializer',
'SupportContractSerializer',
'SupportSKUSerializer',
)


Expand Down
4 changes: 2 additions & 2 deletions netbox_lifecycle/api/_serializers/hardware.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from django.contrib.contenttypes.models import ContentType
from rest_framework import serializers

from netbox.api.fields import ContentTypeField
from netbox.api.serializers import NetBoxModelSerializer
from rest_framework import serializers

from netbox_lifecycle.models import HardwareLifecycle

__all__ = ('HardwareLifecycleSerializer',)
Expand Down
6 changes: 3 additions & 3 deletions netbox_lifecycle/api/_serializers/license.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from rest_framework import serializers

from dcim.api.serializers_.devices import DeviceSerializer
from dcim.api.serializers_.manufacturers import ManufacturerSerializer
from netbox.api.serializers import NetBoxModelSerializer
from rest_framework import serializers
from virtualization.api.serializers_.virtualmachines import VirtualMachineSerializer

from netbox_lifecycle.api._serializers.vendor import VendorSerializer
from netbox_lifecycle.models import License, LicenseAssignment

__all__ = (
'LicenseSerializer',
'LicenseAssignmentSerializer',
'LicenseSerializer',
)


Expand Down
2 changes: 1 addition & 1 deletion netbox_lifecycle/api/_serializers/vendor.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from netbox.api.serializers import NetBoxModelSerializer
from rest_framework import serializers

from netbox.api.serializers import NetBoxModelSerializer
from netbox_lifecycle.models import Vendor

__all__ = ('VendorSerializer',)
Expand Down
10 changes: 5 additions & 5 deletions netbox_lifecycle/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
from netbox_lifecycle.api._serializers.vendor import *

__all__ = (
'VendorSerializer',
'SupportSKUSerializer',
'SupportContractSerializer',
'SupportContractAssignmentSerializer',
'HardwareLifecycleSerializer',
'LicenseSerializer',
'LicenseAssignmentSerializer',
'LicenseSerializer',
'SupportContractAssignmentSerializer',
'SupportContractSerializer',
'SupportSKUSerializer',
'VendorSerializer',
)
1 change: 1 addition & 0 deletions netbox_lifecycle/api/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from netbox.api.routers import NetBoxRouter

from .views import *

router = NetBoxRouter()
Expand Down
17 changes: 9 additions & 8 deletions netbox_lifecycle/api/views/contract.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
from netbox.api.viewsets import NetBoxModelViewSet

from netbox_lifecycle.api.serializers import (
VendorSerializer,
SupportContractSerializer,
SupportContractAssignmentSerializer,
SupportContractSerializer,
SupportSKUSerializer,
VendorSerializer,
)
from netbox_lifecycle.filtersets import (
SupportContractAssignmentFilterSet,
SupportContractFilterSet,
SupportSKUFilterSet,
VendorFilterSet,
SupportContractFilterSet,
SupportContractAssignmentFilterSet,
)
from netbox_lifecycle.models import (
Vendor,
SupportContract,
SupportContractAssignment,
SupportSKU,
Vendor,
)

__all__ = (
'VendorViewSet',
'SupportSKUViewSet',
'SupportContractViewSet',
'SupportContractAssignmentViewSet',
'SupportContractViewSet',
'SupportSKUViewSet',
'VendorViewSet',
)


Expand Down
1 change: 1 addition & 0 deletions netbox_lifecycle/api/views/hardware.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from netbox.api.viewsets import NetBoxModelViewSet

from netbox_lifecycle.api.serializers import HardwareLifecycleSerializer
from netbox_lifecycle.filtersets import HardwareLifecycleFilterSet
from netbox_lifecycle.models import HardwareLifecycle
Expand Down
5 changes: 3 additions & 2 deletions netbox_lifecycle/api/views/license.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from netbox.api.viewsets import NetBoxModelViewSet

from netbox_lifecycle.api.serializers import (
LicenseSerializer,
LicenseAssignmentSerializer,
LicenseSerializer,
)
from netbox_lifecycle.filtersets import LicenseAssignmentFilterSet, LicenseFilterSet
from netbox_lifecycle.models import License, LicenseAssignment

__all__ = ('LicenseViewSet', 'LicenseAssignmentViewSet')
__all__ = ('LicenseAssignmentViewSet', 'LicenseViewSet')


class LicenseViewSet(NetBoxModelViewSet):
Expand Down
4 changes: 2 additions & 2 deletions netbox_lifecycle/constants/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
from netbox_lifecycle.constants.contract import (
CONTRACT_STATUS_ACTIVE,
CONTRACT_STATUS_COLOR,
CONTRACT_STATUS_EXPIRED,
CONTRACT_STATUS_FUTURE,
CONTRACT_STATUS_UNSPECIFIED,
CONTRACT_STATUS_COLOR,
)
from netbox_lifecycle.constants.hardware import HARDWARE_LIFECYCLE_MODELS

__all__ = (
'CONTRACT_STATUS_ACTIVE',
'CONTRACT_STATUS_COLOR',
'CONTRACT_STATUS_EXPIRED',
'CONTRACT_STATUS_FUTURE',
'CONTRACT_STATUS_UNSPECIFIED',
'CONTRACT_STATUS_COLOR',
'HARDWARE_LIFECYCLE_MODELS',
)
10 changes: 5 additions & 5 deletions netbox_lifecycle/filtersets/contract.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import django_filters
from dcim.models import Device, Manufacturer, Module
from django.db.models import Q
from django.utils.translation import gettext as _

from dcim.models import Manufacturer, Device, Module
from netbox.filtersets import NetBoxModelFilterSet
from virtualization.models import VirtualMachine

from netbox_lifecycle.models import (
Vendor,
License,
SupportContract,
SupportContractAssignment,
SupportSKU,
License,
Vendor,
)

__all__ = (
'SupportContractAssignmentFilterSet',
'SupportContractFilterSet',
'SupportSKUFilterSet',
'VendorFilterSet',
'SupportContractAssignmentFilterSet',
)


Expand Down
6 changes: 3 additions & 3 deletions netbox_lifecycle/filtersets/hardware.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import django_filters
from dcim.models import DeviceType, ModuleType
from django.contrib.contenttypes.models import ContentType
from django.utils.translation import gettext as _
from django.db.models import Q

from dcim.models import ModuleType, DeviceType
from django.utils.translation import gettext as _
from netbox.filtersets import NetBoxModelFilterSet

from netbox_lifecycle.models import HardwareLifecycle

__all__ = ('HardwareLifecycleFilterSet',)
Expand Down
8 changes: 4 additions & 4 deletions netbox_lifecycle/filtersets/license.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import django_filters
from dcim.models import Device, Manufacturer
from django.db.models import Q
from django.utils.translation import gettext as _

from dcim.models import Manufacturer, Device
from netbox.filtersets import NetBoxModelFilterSet
from virtualization.models import VirtualMachine
from netbox_lifecycle.models import Vendor, License, LicenseAssignment

from netbox_lifecycle.models import License, LicenseAssignment, Vendor

__all__ = (
'LicenseFilterSet',
'LicenseAssignmentFilterSet',
'LicenseFilterSet',
)


Expand Down
15 changes: 7 additions & 8 deletions netbox_lifecycle/forms/bulk_edit.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
from django import forms
from django.utils.translation import gettext as _

from netbox.forms import NetBoxModelBulkEditForm
from utilities.forms.fields import DynamicModelChoiceField, CommentField
from utilities.forms.fields import CommentField, DynamicModelChoiceField
from utilities.forms.rendering import FieldSet
from utilities.forms.widgets import DatePicker

from netbox_lifecycle.models import (
HardwareLifecycle,
License,
LicenseAssignment,
SupportContract,
SupportSKU,
SupportContractAssignment,
LicenseAssignment,
License,
HardwareLifecycle,
SupportSKU,
Vendor,
)
from utilities.forms.rendering import FieldSet
from utilities.forms.widgets import DatePicker


class VendorBulkEditForm(NetBoxModelBulkEditForm):
Expand Down
15 changes: 7 additions & 8 deletions netbox_lifecycle/forms/bulk_import.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.utils.translation import gettext_lazy as _

from dcim.models import Device, DeviceType, Manufacturer, Module, ModuleType
from django.utils.translation import gettext_lazy as _
from netbox.forms import NetBoxModelImportForm
from utilities.forms.fields import CSVModelChoiceField
from virtualization.models import VirtualMachine
Expand All @@ -16,13 +15,13 @@
)

__all__ = (
'VendorImportForm',
'SupportSKUImportForm',
'SupportContractImportForm',
'SupportContractAssignmentImportForm',
'LicenseImportForm',
'LicenseAssignmentImportForm',
'HardwareLifecycleImportForm',
'LicenseAssignmentImportForm',
'LicenseImportForm',
'SupportContractAssignmentImportForm',
'SupportContractImportForm',
'SupportSKUImportForm',
'VendorImportForm',
)


Expand Down
32 changes: 16 additions & 16 deletions netbox_lifecycle/forms/filtersets.py
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
from dcim.choices import DeviceStatusChoices
from dcim.models import Device, Manufacturer, Module
from django import forms
from django.utils.translation import gettext as _
from django.contrib.contenttypes.models import ContentType
from django.db.models import Q
from django.forms import DateField

from dcim.choices import DeviceStatusChoices
from dcim.models import Device, Manufacturer, Module
from django.utils.translation import gettext as _
from netbox.forms import NetBoxModelFilterSetForm
from utilities.forms.fields import (
DynamicModelMultipleChoiceField,
TagFilterField,
)
from utilities.forms.rendering import FieldSet
from utilities.forms.widgets import APISelectMultiple, DatePicker
from virtualization.models import VirtualMachine

from netbox_lifecycle.models import (
HardwareLifecycle,
SupportContract,
Vendor,
License,
LicenseAssignment,
SupportContract,
SupportContractAssignment,
SupportSKU,
Vendor,
)
from utilities.forms.fields import (
DynamicModelMultipleChoiceField,
TagFilterField,
)
from utilities.forms.rendering import FieldSet
from utilities.forms.widgets import APISelectMultiple, DatePicker

__all__ = (
'HardwareLifecycleFilterForm',
'SupportSKUFilterForm',
'SupportContractFilterForm',
'VendorFilterForm',
'LicenseFilterForm',
'LicenseAssignmentFilterForm',
'LicenseFilterForm',
'SupportContractAssignmentFilterForm',
'SupportContractFilterForm',
'SupportSKUFilterForm',
'VendorFilterForm',
)


Expand Down
32 changes: 16 additions & 16 deletions netbox_lifecycle/forms/model_forms.py
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
from dcim.models import Device, DeviceType, Manufacturer, Module, ModuleType
from django import forms
from django.utils.translation import gettext as _

from dcim.models import DeviceType, ModuleType, Manufacturer, Device, Module
from netbox.forms import NetBoxModelForm
from utilities.forms.fields import (
DynamicModelChoiceField,
)
from utilities.forms.rendering import FieldSet, TabbedGroups
from utilities.forms.widgets import DatePicker
from virtualization.models import VirtualMachine

from netbox_lifecycle.models import (
HardwareLifecycle,
Vendor,
SupportContract,
LicenseAssignment,
License,
LicenseAssignment,
SupportContract,
SupportContractAssignment,
SupportSKU,
Vendor,
)
from utilities.forms.fields import (
DynamicModelChoiceField,
)
from utilities.forms.rendering import FieldSet, TabbedGroups
from utilities.forms.widgets import DatePicker

__all__ = (
'VendorForm',
'SupportSKUForm',
'SupportContractForm',
'SupportContractAssignmentForm',
'LicenseForm',
'LicenseAssignmentForm',
'HardwareLifecycleForm',
'LicenseAssignmentForm',
'LicenseForm',
'SupportContractAssignmentForm',
'SupportContractForm',
'SupportSKUForm',
'VendorForm',
)


Expand Down
Loading
Loading