+
- Object Data
+ Pre-Change Data
-
{{ object.object_data|render_json }}
+ {% if object.prechange_data %}
+
{% for k, v in object.prechange_data.items %}{% spaceless %}
+ {{ k }}: {{ v|render_json }}
+ {% endspaceless %}
+{% endfor %}
+ {% else %}
+
None
+ {% endif %}
+
+
+
+
+
+
+ Post-Change Data
+
+
+ {% if object.postchange_data %}
+
{% for k, v in object.postchange_data.items %}{% spaceless %}
+ {{ k }}: {{ v|render_json }}
+ {% endspaceless %}
+{% endfor %}
+ {% else %}
+
None
+ {% endif %}
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index d76b469b2..f0340f094 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -7,6 +7,7 @@ from django.core.serializers import serialize
from django.db.models import Count, OuterRef, Subquery
from django.db.models.functions import Coalesce
from jinja2 import Environment
+from mptt.models import MPTTModel
from dcim.choices import CableLengthUnitChoices
from extras.utils import is_taggable
@@ -83,7 +84,7 @@ def count_related(model, field):
return Coalesce(subquery, 0)
-def serialize_object(obj, extra=None, exclude=None):
+def serialize_object(obj, extra=None):
"""
Return a generic JSON representation of an object using Django's built-in serializer. (This is used for things like
change logging, not the REST API.) Optionally include a dictionary to supplement the object data. A list of keys
@@ -93,6 +94,11 @@ def serialize_object(obj, extra=None, exclude=None):
json_str = serialize('json', [obj])
data = json.loads(json_str)[0]['fields']
+ # Exclude any MPTTModel fields
+ if issubclass(obj.__class__, MPTTModel):
+ for field in ['level', 'lft', 'rght', 'tree_id']:
+ data.pop(field)
+
# Include custom_field_data as "custom_fields"
if hasattr(obj, 'custom_field_data'):
data['custom_fields'] = data.pop('custom_field_data')
@@ -112,10 +118,6 @@ def serialize_object(obj, extra=None, exclude=None):
if isinstance(key, str) and key.startswith('_'):
data.pop(key)
- # Explicitly excluded keys
- if isinstance(exclude, (list, tuple)) and key in exclude:
- data.pop(key)
-
return data
diff --git a/netbox/virtualization/migrations/0020_standardize_models.py b/netbox/virtualization/migrations/0020_standardize_models.py
index 8ccb3df0d..42c44e83a 100644
--- a/netbox/virtualization/migrations/0020_standardize_models.py
+++ b/netbox/virtualization/migrations/0020_standardize_models.py
@@ -44,4 +44,14 @@ class Migration(migrations.Migration):
name='id',
field=models.BigAutoField(primary_key=True, serialize=False),
),
+ migrations.AddField(
+ model_name='vminterface',
+ name='created',
+ field=models.DateField(auto_now_add=True, null=True),
+ ),
+ migrations.AddField(
+ model_name='vminterface',
+ name='last_updated',
+ field=models.DateTimeField(auto_now=True, null=True),
+ ),
]
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 364dde30b..574400359 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -9,12 +9,11 @@ from dcim.models import BaseInterface, Device
from extras.models import ConfigContextModel, ObjectChange, TaggedItem
from extras.querysets import ConfigContextModelQuerySet
from extras.utils import extras_features
-from netbox.models import BigIDModel, OrganizationalModel, PrimaryModel
+from netbox.models import BigIDModel, ChangeLoggingMixin, OrganizationalModel, PrimaryModel
from utilities.fields import NaturalOrderingField
from utilities.ordering import naturalize_interface
from utilities.query_functions import CollateAsChar
from utilities.querysets import RestrictedQuerySet
-from utilities.utils import serialize_object
from .choices import *
@@ -373,8 +372,9 @@ class VirtualMachine(PrimaryModel, ConfigContextModel):
# Interfaces
#
+# TODO: Inherit from PrimaryModel
@extras_features('export_templates', 'webhooks')
-class VMInterface(BigIDModel, BaseInterface):
+class VMInterface(ChangeLoggingMixin, BigIDModel, BaseInterface):
virtual_machine = models.ForeignKey(
to='virtualization.VirtualMachine',
on_delete=models.CASCADE,
@@ -458,13 +458,7 @@ class VMInterface(BigIDModel, BaseInterface):
def to_objectchange(self, action):
# Annotate the parent VirtualMachine
- return ObjectChange(
- changed_object=self,
- object_repr=str(self),
- action=action,
- related_object=self.virtual_machine,
- object_data=serialize_object(self)
- )
+ return super().to_objectchange(action, related_object=self.virtual_machine)
@property
def parent(self):