NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-29 11:56:25 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

18981 fix tests

Browse Source
This commit is contained in:
Arthur 2025-03-26 08:36:05 -07:00
parent 86458d28e3
commit ba23d94b58
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
netbox/dcim/migrations/0203_device_role_nested.py
View File

@ -12,12 +12,6 @@ class Migration(migrations.Migration):
] ]
operations = [ operations = [
migrations.AlterModelManagers(
name='devicerole',
managers=[
('_tree_manager', django.db.models.manager.Manager()),
],
),
migrations.AddField( migrations.AddField(
model_name='devicerole', model_name='devicerole',
name='level', name='level',
@ -53,4 +47,19 @@ class Migration(migrations.Migration):
to='dcim.devicerole', to='dcim.devicerole',
), ),
), ),
migrations.AddField(
model_name='devicerole',
name='comments',
field=models.TextField(blank=True),
),
migrations.AlterField(
model_name='devicerole',
name='name',
field=models.CharField(max_length=100),
),
migrations.AlterField(
model_name='devicerole',
name='slug',
field=models.SlugField(max_length=100),
),
] ]

13
netbox/dcim/models/devices.py
View File

@ -21,10 +21,9 @@ from dcim.constants import *
from dcim.fields import MACAddressField from dcim.fields import MACAddressField
from extras.models import ConfigContextModel, CustomField from extras.models import ConfigContextModel, CustomField
from extras.querysets import ConfigContextModelQuerySet from extras.querysets import ConfigContextModelQuerySet
from mptt.models import MPTTModel, TreeForeignKey
from netbox.choices import ColorChoices from netbox.choices import ColorChoices
from netbox.config import ConfigItem from netbox.config import ConfigItem
from netbox.models import OrganizationalModel, PrimaryModel from netbox.models import NestedGroupModel, OrganizationalModel, PrimaryModel
from netbox.models.mixins import WeightMixin from netbox.models.mixins import WeightMixin
from netbox.models.features import ContactsMixin, ImageAttachmentsMixin from netbox.models.features import ContactsMixin, ImageAttachmentsMixin
from utilities.fields import ColorField, CounterCacheField from utilities.fields import ColorField, CounterCacheField
@ -469,20 +468,12 @@ class ModuleType(ImageAttachmentsMixin, PrimaryModel, WeightMixin):
# Devices # Devices
# #
class DeviceRole(OrganizationalModel, MPTTModel): class DeviceRole(NestedGroupModel):
""" """
Devices are organized by functional role; for example, "Core Switch" or "File Server". Each DeviceRole is assigned a Devices are organized by functional role; for example, "Core Switch" or "File Server". Each DeviceRole is assigned a
color to be used when displaying rack elevations. The vm_role field determines whether the role is applicable to color to be used when displaying rack elevations. The vm_role field determines whether the role is applicable to
virtual machines as well. virtual machines as well.
""" """
parent = TreeForeignKey(
to='self',
on_delete=models.CASCADE,
related_name='children',
blank=True,
null=True,
db_index=True
)
color = ColorField( color = ColorField(
verbose_name=_('color'), verbose_name=_('color'),
default=ColorChoices.COLOR_GREY default=ColorChoices.COLOR_GREY

4
netbox/dcim/tests/test_api.py
View File

@ -1149,7 +1149,9 @@ class InventoryItemTemplateTest(APIViewTestCases.APIViewTestCase):
class DeviceRoleTest(APIViewTestCases.APIViewTestCase): class DeviceRoleTest(APIViewTestCases.APIViewTestCase):
model = DeviceRole model = DeviceRole
brief_fields = ['description', 'device_count', 'display', 'id', 'name', 'slug', 'url', 'virtualmachine_count'] brief_fields = [
'_depth', 'description', 'device_count', 'display', 'id', 'name', 'slug', 'url', 'virtualmachine_count'
]
create_data = [ create_data = [
{ {
'name': 'Device Role 4', 'name': 'Device Role 4',