From 19363add3015576933d88001c6b766d5a014e165 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 11 Dec 2019 16:04:43 -0500 Subject: [PATCH] Represent and assign ConfigContext tags by their slugs --- netbox/extras/api/serializers.py | 4 ++-- netbox/extras/tests/test_api.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index 6872bab72..f167dee5c 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -173,9 +173,9 @@ class ConfigContextSerializer(ValidatedModelSerializer): required=False, many=True ) - tags = SerializedPKRelatedField( + tags = serializers.SlugRelatedField( queryset=Tag.objects.all(), - serializer=TagSerializer, + slug_field='slug', required=False, many=True ) diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index 8f692e11c..df510aa17 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -370,8 +370,8 @@ class ConfigContextTest(APITestCase): tenantgroup2 = TenantGroup.objects.create(name='Test Tenant Group 2', slug='test-tenant-group-2') 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-ta-1') - tag2 = Tag.objects.create(name='Test Tag 2', slug='test-ta-2') + tag1 = Tag.objects.create(name='Test Tag 1', slug='test-tag-1') + tag2 = Tag.objects.create(name='Test Tag 2', slug='test-tag-2') data = { 'name': 'Test Config Context 4', @@ -382,7 +382,7 @@ class ConfigContextTest(APITestCase): 'platforms': [platform1.pk, platform2.pk], 'tenant_groups': [tenantgroup1.pk, tenantgroup2.pk], 'tenants': [tenant1.pk, tenant2.pk], - 'tags': [tag1.pk, tag2.pk], + 'tags': [tag1.slug, tag2.slug], 'data': {'foo': 'XXX'} } @@ -405,8 +405,8 @@ class ConfigContextTest(APITestCase): self.assertEqual(tenantgroup2.pk, data['tenant_groups'][1]) self.assertEqual(tenant1.pk, data['tenants'][0]) self.assertEqual(tenant2.pk, data['tenants'][1]) - self.assertEqual(tag1.pk, data['tags'][0]) - self.assertEqual(tag2.pk, data['tags'][1]) + self.assertEqual(tag1.slug, data['tags'][0]) + self.assertEqual(tag2.slug, data['tags'][1]) self.assertEqual(configcontext4.data, data['data']) def test_create_configcontext_bulk(self):