NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-24 12:32:42 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Add a description field to all organizational models

Browse Source
This commit is contained in:
Jeremy Stretch
2020-03-13 16:24:37 -04:00
parent 16bbdf7896
commit 97ecfee3d1
28 changed files with 213 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/virtualization/tests/test_filters.py
View File

@@ -15,9 +15,9 @@ class ClusterTypeTestCase(TestCase):
def setUpTestData(cls):
cluster_types = (
ClusterType(name='Cluster Type 1', slug='cluster-type-1'),
ClusterType(name='Cluster Type 2', slug='cluster-type-2'),
ClusterType(name='Cluster Type 3', slug='cluster-type-3'),
ClusterType(name='Cluster Type 1', slug='cluster-type-1', description='A'),
ClusterType(name='Cluster Type 2', slug='cluster-type-2', description='B'),
ClusterType(name='Cluster Type 3', slug='cluster-type-3', description='C'),
)
ClusterType.objects.bulk_create(cluster_types)
@@ -34,6 +34,10 @@ class ClusterTypeTestCase(TestCase):
params = {'slug': ['cluster-type-1', 'cluster-type-2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_description(self):
params = {'description': ['A', 'B']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
class ClusterGroupTestCase(TestCase):
queryset = ClusterGroup.objects.all()
@@ -43,9 +47,9 @@ class ClusterGroupTestCase(TestCase):
def setUpTestData(cls):
cluster_groups = (
ClusterGroup(name='Cluster Group 1', slug='cluster-group-1'),
ClusterGroup(name='Cluster Group 2', slug='cluster-group-2'),
ClusterGroup(name='Cluster Group 3', slug='cluster-group-3'),
ClusterGroup(name='Cluster Group 1', slug='cluster-group-1', description='A'),
ClusterGroup(name='Cluster Group 2', slug='cluster-group-2', description='B'),
ClusterGroup(name='Cluster Group 3', slug='cluster-group-3', description='C'),
)
ClusterGroup.objects.bulk_create(cluster_groups)
@@ -62,6 +66,10 @@ class ClusterGroupTestCase(TestCase):
params = {'slug': ['cluster-group-1', 'cluster-group-2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_description(self):
params = {'description': ['A', 'B']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
class ClusterTestCase(TestCase):
queryset = Cluster.objects.all()

18
netbox/virtualization/tests/test_views.py
View File

@@ -23,13 +23,14 @@ class ClusterGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
cls.form_data = {
'name': 'Cluster Group X',
'slug': 'cluster-group-x',
'description': 'A new cluster group',
}
cls.csv_data = (
"name,slug",
"Cluster Group 4,cluster-group-4",
"Cluster Group 5,cluster-group-5",
"Cluster Group 6,cluster-group-6",
"name,slug,description",
"Cluster Group 4,cluster-group-4,Fourth cluster group",
"Cluster Group 5,cluster-group-5,Fifth cluster group",
"Cluster Group 6,cluster-group-6,Sixth cluster group",
)
@@ -48,13 +49,14 @@ class ClusterTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
cls.form_data = {
'name': 'Cluster Type X',
'slug': 'cluster-type-x',
'description': 'A new cluster type',
}
cls.csv_data = (
"name,slug",
"Cluster Type 4,cluster-type-4",
"Cluster Type 5,cluster-type-5",
"Cluster Type 6,cluster-type-6",
"name,slug,description",
"Cluster Type 4,cluster-type-4,Fourth cluster type",
"Cluster Type 5,cluster-type-5,Fifth cluster type",
"Cluster Type 6,cluster-type-6,Sixth cluster type",
)