From 45f6ea211d107652393b6f9a0d12709e3e2b7b82 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 11 Mar 2020 20:20:04 -0400 Subject: [PATCH 1/2] Implement support for nested TenantGroups --- netbox/tenancy/api/serializers.py | 3 +- netbox/tenancy/filters.py | 38 ++++++++++------ netbox/tenancy/forms.py | 18 +++++++- .../migrations/0007_nested_tenantgroups.py | 43 +++++++++++++++++++ .../0008_nested_tenantgroups_rebuild.py | 21 +++++++++ netbox/tenancy/models.py | 29 +++++++++++-- netbox/tenancy/tables.py | 25 +++++++++-- netbox/tenancy/views.py | 8 +++- 8 files changed, 163 insertions(+), 22 deletions(-) create mode 100644 netbox/tenancy/migrations/0007_nested_tenantgroups.py create mode 100644 netbox/tenancy/migrations/0008_nested_tenantgroups_rebuild.py diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py index 7599029c5..ec5e60a34 100644 --- a/netbox/tenancy/api/serializers.py +++ b/netbox/tenancy/api/serializers.py @@ -12,11 +12,12 @@ from .nested_serializers import * # class TenantGroupSerializer(ValidatedModelSerializer): + parent = NestedTenantGroupSerializer(required=False, allow_null=True) tenant_count = serializers.IntegerField(read_only=True) class Meta: model = TenantGroup - fields = ['id', 'name', 'slug', 'tenant_count'] + fields = ['id', 'name', 'slug', 'parent', 'tenant_count'] class TenantSerializer(TaggitSerializer, CustomFieldModelSerializer): diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py index dc1635392..12e852879 100644 --- a/netbox/tenancy/filters.py +++ b/netbox/tenancy/filters.py @@ -2,7 +2,7 @@ import django_filters from django.db.models import Q from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet -from utilities.filters import BaseFilterSet, NameSlugSearchFilterSet, TagFilter +from utilities.filters import BaseFilterSet, NameSlugSearchFilterSet, TagFilter, TreeNodeMultipleChoiceFilter from .models import Tenant, TenantGroup @@ -14,6 +14,16 @@ __all__ = ( class TenantGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet): + parent_id = django_filters.ModelMultipleChoiceFilter( + queryset=TenantGroup.objects.all(), + label='Tenant group (ID)', + ) + parent = django_filters.ModelMultipleChoiceFilter( + field_name='parent__slug', + queryset=TenantGroup.objects.all(), + to_field_name='slug', + label='Tenant group group (slug)', + ) class Meta: model = TenantGroup @@ -25,15 +35,18 @@ class TenantFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterS method='search', label='Search', ) - group_id = django_filters.ModelMultipleChoiceFilter( + group_id = TreeNodeMultipleChoiceFilter( queryset=TenantGroup.objects.all(), - label='Group (ID)', + field_name='group', + lookup_expr='in', + label='Tenant group (ID)', ) - group = django_filters.ModelMultipleChoiceFilter( - field_name='group__slug', + group = TreeNodeMultipleChoiceFilter( queryset=TenantGroup.objects.all(), + field_name='group', + lookup_expr='in', to_field_name='slug', - label='Group (slug)', + label='Tenant group (slug)', ) tag = TagFilter() @@ -56,16 +69,17 @@ class TenancyFilterSet(django_filters.FilterSet): """ An inheritable FilterSet for models which support Tenant assignment. """ - tenant_group_id = django_filters.ModelMultipleChoiceFilter( - field_name='tenant__group__id', + tenant_group_id = TreeNodeMultipleChoiceFilter( queryset=TenantGroup.objects.all(), - to_field_name='id', + field_name='tenant__group', + lookup_expr='in', label='Tenant Group (ID)', ) - tenant_group = django_filters.ModelMultipleChoiceFilter( - field_name='tenant__group__slug', + tenant_group = TreeNodeMultipleChoiceFilter( queryset=TenantGroup.objects.all(), + field_name='tenant__group', to_field_name='slug', + lookup_expr='in', label='Tenant Group (slug)', ) tenant_id = django_filters.ModelMultipleChoiceFilter( @@ -73,8 +87,8 @@ class TenancyFilterSet(django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - field_name='tenant__slug', queryset=Tenant.objects.all(), + field_name='tenant__slug', to_field_name='slug', label='Tenant (slug)', ) diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py index 5b828b661..9b8fc59da 100644 --- a/netbox/tenancy/forms.py +++ b/netbox/tenancy/forms.py @@ -16,16 +16,32 @@ from .models import Tenant, TenantGroup # class TenantGroupForm(BootstrapMixin, forms.ModelForm): + parent = DynamicModelChoiceField( + queryset=TenantGroup.objects.all(), + required=False, + widget=APISelect( + api_url="/api/tenancy/tenant-groups/" + ) + ) slug = SlugField() class Meta: model = TenantGroup fields = [ - 'name', 'slug', + 'parent', 'name', 'slug', ] class TenantGroupCSVForm(forms.ModelForm): + parent = forms.ModelChoiceField( + queryset=TenantGroup.objects.all(), + required=False, + to_field_name='name', + help_text='Name of parent tenant group', + error_messages={ + 'invalid_choice': 'Tenant group not found.', + } + ) slug = SlugField() class Meta: diff --git a/netbox/tenancy/migrations/0007_nested_tenantgroups.py b/netbox/tenancy/migrations/0007_nested_tenantgroups.py new file mode 100644 index 000000000..4278b3409 --- /dev/null +++ b/netbox/tenancy/migrations/0007_nested_tenantgroups.py @@ -0,0 +1,43 @@ +from django.db import migrations, models +import django.db.models.deletion +import mptt.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('tenancy', '0006_custom_tag_models'), + ] + + operations = [ + migrations.AddField( + model_name='tenantgroup', + name='parent', + field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='tenancy.TenantGroup'), + ), + migrations.AddField( + model_name='tenantgroup', + name='level', + field=models.PositiveIntegerField(default=0, editable=False), + preserve_default=False, + ), + migrations.AddField( + model_name='tenantgroup', + name='lft', + field=models.PositiveIntegerField(default=1, editable=False), + preserve_default=False, + ), + migrations.AddField( + model_name='tenantgroup', + name='rght', + field=models.PositiveIntegerField(default=2, editable=False), + preserve_default=False, + ), + # tree_id will be set to a valid value during the following migration (which needs to be a separate migration) + migrations.AddField( + model_name='tenantgroup', + name='tree_id', + field=models.PositiveIntegerField(db_index=True, default=0, editable=False), + preserve_default=False, + ), + ] diff --git a/netbox/tenancy/migrations/0008_nested_tenantgroups_rebuild.py b/netbox/tenancy/migrations/0008_nested_tenantgroups_rebuild.py new file mode 100644 index 000000000..e31a75d36 --- /dev/null +++ b/netbox/tenancy/migrations/0008_nested_tenantgroups_rebuild.py @@ -0,0 +1,21 @@ +from django.db import migrations + + +def rebuild_mptt(apps, schema_editor): + TenantGroup = apps.get_model('tenancy', 'TenantGroup') + for i, tenantgroup in enumerate(TenantGroup.objects.all(), start=1): + TenantGroup.objects.filter(pk=tenantgroup.pk).update(tree_id=i) + + +class Migration(migrations.Migration): + + dependencies = [ + ('tenancy', '0007_nested_tenantgroups'), + ] + + operations = [ + migrations.RunPython( + code=rebuild_mptt, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py index 9fa7f23ea..1a02184cd 100644 --- a/netbox/tenancy/models.py +++ b/netbox/tenancy/models.py @@ -1,10 +1,12 @@ from django.contrib.contenttypes.fields import GenericRelation from django.db import models from django.urls import reverse +from mptt.models import MPTTModel, TreeForeignKey from taggit.managers import TaggableManager -from extras.models import CustomFieldModel, TaggedItem +from extras.models import CustomFieldModel, ObjectChange, TaggedItem from utilities.models import ChangeLoggedModel +from utilities.utils import serialize_object __all__ = ( @@ -13,7 +15,7 @@ __all__ = ( ) -class TenantGroup(ChangeLoggedModel): +class TenantGroup(MPTTModel, ChangeLoggedModel): """ An arbitrary collection of Tenants. """ @@ -24,12 +26,23 @@ class TenantGroup(ChangeLoggedModel): slug = models.SlugField( unique=True ) + parent = TreeForeignKey( + to='self', + on_delete=models.CASCADE, + related_name='children', + blank=True, + null=True, + db_index=True + ) - csv_headers = ['name', 'slug'] + csv_headers = ['name', 'slug', 'parent'] class Meta: ordering = ['name'] + class MPTTMeta: + order_insertion_by = ['name'] + def __str__(self): return self.name @@ -40,6 +53,16 @@ class TenantGroup(ChangeLoggedModel): return ( self.name, self.slug, + self.parent.name if self.parent else '', + ) + + def to_objectchange(self, action): + # Remove MPTT-internal fields + return ObjectChange( + changed_object=self, + object_repr=str(self), + action=action, + object_data=serialize_object(self, exclude=['level', 'lft', 'rght', 'tree_id']) ) diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py index af4fb34c0..adf73dc41 100644 --- a/netbox/tenancy/tables.py +++ b/netbox/tenancy/tables.py @@ -3,6 +3,16 @@ import django_tables2 as tables from utilities.tables import BaseTable, ToggleColumn from .models import Tenant, TenantGroup +MPTT_LINK = """ +{% if record.get_children %} + +{% else %} + +{% endif %} + {{ record.name }} + +""" + TENANTGROUP_ACTIONS = """ @@ -27,11 +37,18 @@ COL_TENANT = """ class TenantGroupTable(BaseTable): pk = ToggleColumn() - name = tables.LinkColumn(verbose_name='Name') - tenant_count = tables.Column(verbose_name='Tenants') - slug = tables.Column(verbose_name='Slug') + name = tables.TemplateColumn( + template_code=MPTT_LINK, + orderable=False + ) + tenant_count = tables.Column( + verbose_name='Tenants' + ) + slug = tables.Column() actions = tables.TemplateColumn( - template_code=TENANTGROUP_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' + template_code=TENANTGROUP_ACTIONS, + attrs={'td': {'class': 'text-right noprint'}}, + verbose_name='' ) class Meta(BaseTable.Meta): diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index 0319a20b0..afc363cd6 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -20,7 +20,13 @@ from .models import Tenant, TenantGroup class TenantGroupListView(PermissionRequiredMixin, ObjectListView): permission_required = 'tenancy.view_tenantgroup' - queryset = TenantGroup.objects.annotate(tenant_count=Count('tenants')) + queryset = TenantGroup.objects.add_related_count( + TenantGroup.objects.all(), + Tenant, + 'group', + 'tenant_count', + cumulative=True + ) table = tables.TenantGroupTable From b5d57262f9c5feede98123aff2f9c46c9085c45e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 11 Mar 2020 21:14:53 -0400 Subject: [PATCH 2/2] Update tests for nested TenantGroups --- netbox/circuits/tests/test_filters.py | 3 +- netbox/dcim/tests/test_filters.py | 12 ++- netbox/extras/tests/test_api.py | 6 +- netbox/extras/tests/test_filters.py | 3 +- netbox/ipam/tests/test_filters.py | 12 ++- netbox/tenancy/tests/test_api.py | 92 +++++++++++++-------- netbox/tenancy/tests/test_filters.py | 37 ++++++--- netbox/tenancy/tests/test_views.py | 21 +++-- netbox/virtualization/tests/test_filters.py | 6 +- 9 files changed, 126 insertions(+), 66 deletions(-) diff --git a/netbox/circuits/tests/test_filters.py b/netbox/circuits/tests/test_filters.py index 8ce679501..346d2ad80 100644 --- a/netbox/circuits/tests/test_filters.py +++ b/netbox/circuits/tests/test_filters.py @@ -139,7 +139,8 @@ class CircuitTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), diff --git a/netbox/dcim/tests/test_filters.py b/netbox/dcim/tests/test_filters.py index edd366a58..3986d0892 100644 --- a/netbox/dcim/tests/test_filters.py +++ b/netbox/dcim/tests/test_filters.py @@ -81,7 +81,8 @@ class SiteTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), @@ -311,7 +312,8 @@ class RackTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), @@ -471,7 +473,8 @@ class RackReservationTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), @@ -1187,7 +1190,8 @@ class DeviceTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index abc2c684f..6871b2654 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -402,8 +402,10 @@ class ConfigContextTest(APITestCase): role2 = DeviceRole.objects.create(name='Test Role 2', slug='test-role-2') platform1 = Platform.objects.create(name='Test Platform 1', slug='test-platform-1') platform2 = Platform.objects.create(name='Test Platform 2', slug='test-platform-2') - tenantgroup1 = TenantGroup.objects.create(name='Test Tenant Group 1', slug='test-tenant-group-1') - tenantgroup2 = TenantGroup.objects.create(name='Test Tenant Group 2', slug='test-tenant-group-2') + tenantgroup1 = TenantGroup(name='Test Tenant Group 1', slug='test-tenant-group-1') + tenantgroup1.save() + tenantgroup2 = TenantGroup(name='Test Tenant Group 2', slug='test-tenant-group-2') + tenantgroup2.save() tenant1 = Tenant.objects.create(name='Test Tenant 1', slug='test-tenant-1') tenant2 = Tenant.objects.create(name='Test Tenant 2', slug='test-tenant-2') tag1 = Tag.objects.create(name='Test Tag 1', slug='test-tag-1') diff --git a/netbox/extras/tests/test_filters.py b/netbox/extras/tests/test_filters.py index ab559cf73..126414cfd 100644 --- a/netbox/extras/tests/test_filters.py +++ b/netbox/extras/tests/test_filters.py @@ -128,7 +128,8 @@ class ConfigContextTestCase(TestCase): TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1'), diff --git a/netbox/ipam/tests/test_filters.py b/netbox/ipam/tests/test_filters.py index 333b80bc8..5bfbb30d9 100644 --- a/netbox/ipam/tests/test_filters.py +++ b/netbox/ipam/tests/test_filters.py @@ -20,7 +20,8 @@ class VRFTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), @@ -222,7 +223,8 @@ class PrefixTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), @@ -379,7 +381,8 @@ class IPAddressTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), @@ -593,7 +596,8 @@ class VLANTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py index 495cb250d..1767c8f28 100644 --- a/netbox/tenancy/tests/test_api.py +++ b/netbox/tenancy/tests/test_api.py @@ -28,23 +28,34 @@ class TenantGroupTest(APITestCase): super().setUp() - self.tenantgroup1 = TenantGroup.objects.create(name='Test Tenant Group 1', slug='test-tenant-group-1') - self.tenantgroup2 = TenantGroup.objects.create(name='Test Tenant Group 2', slug='test-tenant-group-2') - self.tenantgroup3 = TenantGroup.objects.create(name='Test Tenant Group 3', slug='test-tenant-group-3') + self.parent_tenant_groups = ( + TenantGroup(name='Parent Tenant Group 1', slug='parent-tenant-group-1'), + TenantGroup(name='Parent Tenant Group 2', slug='parent-tenant-group-2'), + ) + for tenantgroup in self.parent_tenant_groups: + tenantgroup.save() + + self.tenant_groups = ( + TenantGroup(name='Tenant Group 1', slug='tenant-group-1', parent=self.parent_tenant_groups[0]), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2', parent=self.parent_tenant_groups[0]), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3', parent=self.parent_tenant_groups[0]), + ) + for tenantgroup in self.tenant_groups: + tenantgroup.save() def test_get_tenantgroup(self): - url = reverse('tenancy-api:tenantgroup-detail', kwargs={'pk': self.tenantgroup1.pk}) + url = reverse('tenancy-api:tenantgroup-detail', kwargs={'pk': self.tenant_groups[0].pk}) response = self.client.get(url, **self.header) - self.assertEqual(response.data['name'], self.tenantgroup1.name) + self.assertEqual(response.data['name'], self.tenant_groups[0].name) def test_list_tenantgroups(self): url = reverse('tenancy-api:tenantgroup-list') response = self.client.get(url, **self.header) - self.assertEqual(response.data['count'], 3) + self.assertEqual(response.data['count'], 5) def test_list_tenantgroups_brief(self): @@ -59,33 +70,38 @@ class TenantGroupTest(APITestCase): def test_create_tenantgroup(self): data = { - 'name': 'Test Tenant Group 4', - 'slug': 'test-tenant-group-4', + 'name': 'Tenant Group 4', + 'slug': 'tenant-group-4', + 'parent': self.parent_tenant_groups[0].pk, } url = reverse('tenancy-api:tenantgroup-list') response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(TenantGroup.objects.count(), 4) + self.assertEqual(TenantGroup.objects.count(), 6) tenantgroup4 = TenantGroup.objects.get(pk=response.data['id']) self.assertEqual(tenantgroup4.name, data['name']) self.assertEqual(tenantgroup4.slug, data['slug']) + self.assertEqual(tenantgroup4.parent_id, data['parent']) def test_create_tenantgroup_bulk(self): data = [ { - 'name': 'Test Tenant Group 4', - 'slug': 'test-tenant-group-4', + 'name': 'Tenant Group 4', + 'slug': 'tenant-group-4', + 'parent': self.parent_tenant_groups[0].pk, }, { - 'name': 'Test Tenant Group 5', - 'slug': 'test-tenant-group-5', + 'name': 'Tenant Group 5', + 'slug': 'tenant-group-5', + 'parent': self.parent_tenant_groups[0].pk, }, { - 'name': 'Test Tenant Group 6', - 'slug': 'test-tenant-group-6', + 'name': 'Tenant Group 6', + 'slug': 'tenant-group-6', + 'parent': self.parent_tenant_groups[0].pk, }, ] @@ -93,7 +109,7 @@ class TenantGroupTest(APITestCase): response = self.client.post(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(TenantGroup.objects.count(), 6) + self.assertEqual(TenantGroup.objects.count(), 8) self.assertEqual(response.data[0]['name'], data[0]['name']) self.assertEqual(response.data[1]['name'], data[1]['name']) self.assertEqual(response.data[2]['name'], data[2]['name']) @@ -101,26 +117,28 @@ class TenantGroupTest(APITestCase): def test_update_tenantgroup(self): data = { - 'name': 'Test Tenant Group X', - 'slug': 'test-tenant-group-x', + 'name': 'Tenant Group X', + 'slug': 'tenant-group-x', + 'parent': self.parent_tenant_groups[1].pk, } - url = reverse('tenancy-api:tenantgroup-detail', kwargs={'pk': self.tenantgroup1.pk}) + url = reverse('tenancy-api:tenantgroup-detail', kwargs={'pk': self.tenant_groups[0].pk}) response = self.client.put(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_200_OK) - self.assertEqual(TenantGroup.objects.count(), 3) + self.assertEqual(TenantGroup.objects.count(), 5) tenantgroup1 = TenantGroup.objects.get(pk=response.data['id']) self.assertEqual(tenantgroup1.name, data['name']) self.assertEqual(tenantgroup1.slug, data['slug']) + self.assertEqual(tenantgroup1.parent_id, data['parent']) def test_delete_tenantgroup(self): - url = reverse('tenancy-api:tenantgroup-detail', kwargs={'pk': self.tenantgroup1.pk}) + url = reverse('tenancy-api:tenantgroup-detail', kwargs={'pk': self.tenant_groups[0].pk}) response = self.client.delete(url, **self.header) self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) - self.assertEqual(TenantGroup.objects.count(), 2) + self.assertEqual(TenantGroup.objects.count(), 4) class TenantTest(APITestCase): @@ -129,18 +147,26 @@ class TenantTest(APITestCase): super().setUp() - self.tenantgroup1 = TenantGroup.objects.create(name='Test Tenant Group 1', slug='test-tenant-group-1') - self.tenantgroup2 = TenantGroup.objects.create(name='Test Tenant Group 2', slug='test-tenant-group-2') - self.tenant1 = Tenant.objects.create(name='Test Tenant 1', slug='test-tenant-1', group=self.tenantgroup1) - self.tenant2 = Tenant.objects.create(name='Test Tenant 2', slug='test-tenant-2', group=self.tenantgroup1) - self.tenant3 = Tenant.objects.create(name='Test Tenant 3', slug='test-tenant-3', group=self.tenantgroup1) + self.tenant_groups = ( + TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), + ) + for tenantgroup in self.tenant_groups: + tenantgroup.save() + + self.tenants = ( + Tenant(name='Test Tenant 1', slug='test-tenant-1', group=self.tenant_groups[0]), + Tenant(name='Test Tenant 2', slug='test-tenant-2', group=self.tenant_groups[0]), + Tenant(name='Test Tenant 3', slug='test-tenant-3', group=self.tenant_groups[0]), + ) + Tenant.objects.bulk_create(self.tenants) def test_get_tenant(self): - url = reverse('tenancy-api:tenant-detail', kwargs={'pk': self.tenant1.pk}) + url = reverse('tenancy-api:tenant-detail', kwargs={'pk': self.tenants[0].pk}) response = self.client.get(url, **self.header) - self.assertEqual(response.data['name'], self.tenant1.name) + self.assertEqual(response.data['name'], self.tenants[0].name) def test_list_tenants(self): @@ -164,7 +190,7 @@ class TenantTest(APITestCase): data = { 'name': 'Test Tenant 4', 'slug': 'test-tenant-4', - 'group': self.tenantgroup1.pk, + 'group': self.tenant_groups[0].pk, } url = reverse('tenancy-api:tenant-list') @@ -208,10 +234,10 @@ class TenantTest(APITestCase): data = { 'name': 'Test Tenant X', 'slug': 'test-tenant-x', - 'group': self.tenantgroup2.pk, + 'group': self.tenant_groups[1].pk, } - url = reverse('tenancy-api:tenant-detail', kwargs={'pk': self.tenant1.pk}) + url = reverse('tenancy-api:tenant-detail', kwargs={'pk': self.tenants[0].pk}) response = self.client.put(url, data, format='json', **self.header) self.assertHttpStatus(response, status.HTTP_200_OK) @@ -223,7 +249,7 @@ class TenantTest(APITestCase): def test_delete_tenant(self): - url = reverse('tenancy-api:tenant-detail', kwargs={'pk': self.tenant1.pk}) + url = reverse('tenancy-api:tenant-detail', kwargs={'pk': self.tenants[0].pk}) response = self.client.delete(url, **self.header) self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) diff --git a/netbox/tenancy/tests/test_filters.py b/netbox/tenancy/tests/test_filters.py index de2c0886d..bb1ac889c 100644 --- a/netbox/tenancy/tests/test_filters.py +++ b/netbox/tenancy/tests/test_filters.py @@ -11,12 +11,21 @@ class TenantGroupTestCase(TestCase): @classmethod def setUpTestData(cls): - groups = ( - TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), - TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), - TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), + parent_tenant_groups = ( + TenantGroup(name='Parent Tenant Group 1', slug='parent-tenant-group-1'), + TenantGroup(name='Parent Tenant Group 2', slug='parent-tenant-group-2'), + TenantGroup(name='Parent Tenant Group 3', slug='parent-tenant-group-3'), ) - TenantGroup.objects.bulk_create(groups) + for tenantgroup in parent_tenant_groups: + tenantgroup.save() + + tenant_groups = ( + TenantGroup(name='Tenant Group 1', slug='tenant-group-1', parent=parent_tenant_groups[0]), + TenantGroup(name='Tenant Group 2', slug='tenant-group-2', parent=parent_tenant_groups[1]), + TenantGroup(name='Tenant Group 3', slug='tenant-group-3', parent=parent_tenant_groups[2]), + ) + for tenantgroup in tenant_groups: + tenantgroup.save() def test_id(self): id_list = self.queryset.values_list('id', flat=True)[:2] @@ -31,6 +40,13 @@ class TenantGroupTestCase(TestCase): params = {'slug': ['tenant-group-1', 'tenant-group-2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_parent(self): + parent_groups = TenantGroup.objects.filter(name__startswith='Parent')[:2] + params = {'parent_id': [parent_groups[0].pk, parent_groups[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'parent': [parent_groups[0].slug, parent_groups[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + class TenantTestCase(TestCase): queryset = Tenant.objects.all() @@ -39,17 +55,18 @@ class TenantTestCase(TestCase): @classmethod def setUpTestData(cls): - groups = ( + tenant_groups = ( TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( - Tenant(name='Tenant 1', slug='tenant-1', group=groups[0]), - Tenant(name='Tenant 2', slug='tenant-2', group=groups[1]), - Tenant(name='Tenant 3', slug='tenant-3', group=groups[2]), + Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), + Tenant(name='Tenant 2', slug='tenant-2', group=tenant_groups[1]), + Tenant(name='Tenant 3', slug='tenant-3', group=tenant_groups[2]), ) Tenant.objects.bulk_create(tenants) diff --git a/netbox/tenancy/tests/test_views.py b/netbox/tenancy/tests/test_views.py index 27e2c1591..5b47f8080 100644 --- a/netbox/tenancy/tests/test_views.py +++ b/netbox/tenancy/tests/test_views.py @@ -8,11 +8,13 @@ class TenantGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase): @classmethod def setUpTestData(cls): - TenantGroup.objects.bulk_create([ + tenant_groups = ( TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), TenantGroup(name='Tenant Group 3', slug='tenant-group-3'), - ]) + ) + for tenanantgroup in tenant_groups: + tenanantgroup.save() cls.form_data = { 'name': 'Tenant Group X', @@ -33,22 +35,23 @@ class TenantTestCase(ViewTestCases.PrimaryObjectViewTestCase): @classmethod def setUpTestData(cls): - tenantgroups = ( + tenant_groups = ( TenantGroup(name='Tenant Group 1', slug='tenant-group-1'), TenantGroup(name='Tenant Group 2', slug='tenant-group-2'), ) - TenantGroup.objects.bulk_create(tenantgroups) + for tenanantgroup in tenant_groups: + tenanantgroup.save() Tenant.objects.bulk_create([ - Tenant(name='Tenant 1', slug='tenant-1', group=tenantgroups[0]), - Tenant(name='Tenant 2', slug='tenant-2', group=tenantgroups[0]), - Tenant(name='Tenant 3', slug='tenant-3', group=tenantgroups[0]), + Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), + Tenant(name='Tenant 2', slug='tenant-2', group=tenant_groups[0]), + Tenant(name='Tenant 3', slug='tenant-3', group=tenant_groups[0]), ]) cls.form_data = { 'name': 'Tenant X', 'slug': 'tenant-x', - 'group': tenantgroups[1].pk, + 'group': tenant_groups[1].pk, 'description': 'A new tenant', 'comments': 'Some comments', 'tags': 'Alpha,Bravo,Charlie', @@ -62,5 +65,5 @@ class TenantTestCase(ViewTestCases.PrimaryObjectViewTestCase): ) cls.bulk_edit_data = { - 'group': tenantgroups[1].pk, + 'group': tenant_groups[1].pk, } diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py index 9b61896e9..db5935be9 100644 --- a/netbox/virtualization/tests/test_filters.py +++ b/netbox/virtualization/tests/test_filters.py @@ -105,7 +105,8 @@ class ClusterTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), @@ -231,7 +232,8 @@ class VirtualMachineTestCase(TestCase): TenantGroup(name='Tenant group 2', slug='tenant-group-2'), TenantGroup(name='Tenant group 3', slug='tenant-group-3'), ) - TenantGroup.objects.bulk_create(tenant_groups) + for tenantgroup in tenant_groups: + tenantgroup.save() tenants = ( Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]),