diff --git a/netbox/netbox/models/__init__.py b/netbox/netbox/models/__init__.py index f07f757369..b067181366 100644 --- a/netbox/netbox/models/__init__.py +++ b/netbox/netbox/models/__init__.py @@ -50,21 +50,15 @@ def get_absolute_url(self): # Base model classes # -class ChangeLoggedModel(ChangeLoggingMixin, CustomValidationMixin, EventRulesMixin, models.Model): +class BaseModel(models.Model): """ - Base model for ancillary models; provides limited functionality for models which don't - support NetBox's full feature set. - """ - objects = RestrictedQuerySet.as_manager() - - class Meta: - abstract = True - + A global base model for all NetBox objects. -class NetBoxModel(NetBoxFeatureSet, models.Model): - """ - Base model for most object types. Suitable for use by plugins. + This class provides some important overrides to Django's default functionality, such as + - Overriding the default manager to use RestrictedQuerySet + - Extending `clean()` to validate GenericForeignKey fields """ + objects = RestrictedQuerySet.as_manager() class Meta: @@ -103,6 +97,25 @@ def clean(self): setattr(self, field.name, obj) +class ChangeLoggedModel(ChangeLoggingMixin, CustomValidationMixin, EventRulesMixin, BaseModel): + """ + Base model for ancillary models; provides limited functionality for models which don't + support NetBox's full feature set. + """ + + class Meta: + abstract = True + + +class NetBoxModel(NetBoxFeatureSet, BaseModel): + """ + Base model for most object types. Suitable for use by plugins. + """ + + class Meta: + abstract = True + + # # NetBox internal base models # @@ -177,7 +190,7 @@ def clean(self): }) -class OrganizationalModel(NetBoxFeatureSet, models.Model): +class OrganizationalModel(NetBoxModel): """ Organizational models are those which are used solely to categorize and qualify other objects, and do not convey any real information about the infrastructure being modeled (for example, functional device roles). Organizational @@ -202,8 +215,6 @@ class OrganizationalModel(NetBoxFeatureSet, models.Model): blank=True ) - objects = RestrictedQuerySet.as_manager() - class Meta: abstract = True ordering = ('name',)