From a7e142a2e45a1eac1cd4d74493a8719e1f64bb74 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 19 Jul 2023 14:52:14 +0700 Subject: [PATCH] 6347 move trackingmixin to specific models --- netbox/dcim/models/devices.py | 3 ++- netbox/netbox/models/__init__.py | 2 -- netbox/virtualization/models/virtualmachines.py | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 4e76c139e..a6fca4483 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -22,6 +22,7 @@ from netbox.config import ConfigItem from netbox.models import OrganizationalModel, PrimaryModel from utilities.choices import ColorChoices from utilities.fields import ColorField, CounterCacheField, NaturalOrderingField +from utilities.mixins import TrackingModelMixin from .device_components import * from .mixins import WeightMixin @@ -469,7 +470,7 @@ def update_interface_bridges(device, interface_templates, module=None): interface.save() -class Device(PrimaryModel, ConfigContextModel): +class Device(PrimaryModel, ConfigContextModel, TrackingModelMixin): """ A Device represents a piece of physical hardware mounted within a Rack. Each Device is assigned a DeviceType, DeviceRole, and (optionally) a Platform. Device names are not required, however if one is set it must be unique. diff --git a/netbox/netbox/models/__init__.py b/netbox/netbox/models/__init__.py index e46186d2d..23dcfb985 100644 --- a/netbox/netbox/models/__init__.py +++ b/netbox/netbox/models/__init__.py @@ -7,7 +7,6 @@ from mptt.models import MPTTModel, TreeForeignKey from netbox.models.features import * from utilities.mptt import TreeManager from utilities.querysets import RestrictedQuerySet -from utilities.mixins import TrackingModelMixin __all__ = ( @@ -28,7 +27,6 @@ class NetBoxFeatureSet( ExportTemplatesMixin, JournalingMixin, TagsMixin, - TrackingModelMixin, WebhooksMixin ): class Meta: diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index 59351730e..6e1c9326b 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -12,6 +12,7 @@ from extras.querysets import ConfigContextModelQuerySet from netbox.config import get_config from netbox.models import NetBoxModel, PrimaryModel from utilities.fields import CounterCacheField, NaturalOrderingField +from utilities.mixins import TrackingModelMixin from utilities.ordering import naturalize_interface from utilities.query_functions import CollateAsChar from virtualization.choices import * @@ -22,7 +23,7 @@ __all__ = ( ) -class VirtualMachine(PrimaryModel, ConfigContextModel): +class VirtualMachine(PrimaryModel, ConfigContextModel, TrackingModelMixin): """ A virtual machine which runs inside a Cluster. """