Closes #1687: Enabled custom fields for services

netbox/extras/constants.py

@@ -3,11 +3,11 @@ from __future__ import unicode_literals
 
 # Models which support custom fields
 CUSTOMFIELD_MODELS = (
-    'provider', 'circuit',                                  # Circuits
+    'provider', 'circuit',                                         # Circuits
-    'site', 'rack', 'devicetype', 'device',                 # DCIM
+    'site', 'rack', 'devicetype', 'device',                        # DCIM
-    'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf',      # IPAM
+    'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service',  # IPAM
-    'tenant',                                               # Tenancy
+    'tenant',                                                      # Tenancy
-    'cluster', 'virtualmachine',                            # Virtualization
+    'cluster', 'virtualmachine',                                   # Virtualization
 )
 
 # Custom field types

netbox/ipam/api/serializers.py

@@ -301,7 +301,7 @@ class AvailableIPSerializer(serializers.Serializer):
 # Services
 #
 
-class ServiceSerializer(ValidatedModelSerializer):
+class ServiceSerializer(CustomFieldModelSerializer):
     device = NestedDeviceSerializer(required=False, allow_null=True)
     virtual_machine = NestedVirtualMachineSerializer(required=False, allow_null=True)
     protocol = ChoiceFieldSerializer(choices=IP_PROTOCOL_CHOICES)
@@ -315,6 +315,6 @@ class ServiceSerializer(ValidatedModelSerializer):
     class Meta:
         model = Service
         fields = [
-            'id', 'device', 'virtual_machine', 'name', 'port', 'protocol', 'ipaddresses', 'description', 'created',
+            'id', 'device', 'virtual_machine', 'name', 'port', 'protocol', 'ipaddresses', 'description',
-            'last_updated',
+            'custom_fields', 'created', 'last_updated',
         ]

netbox/ipam/forms.py

@@ -11,9 +11,9 @@ from extras.forms import CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFi
 from tenancy.forms import TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    AnnotatedMultipleChoiceField, APISelect, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
+    AnnotatedMultipleChoiceField, APISelect, BootstrapMixin, BulkEditNullBooleanSelect, ChainedModelChoiceField,
-    ChainedModelChoiceField, CSVChoiceField, ExpandableIPAddressField, FilterChoiceField, FlexibleModelChoiceField,
+    CSVChoiceField, ExpandableIPAddressField, FilterChoiceField, FlexibleModelChoiceField, Livesearch, ReturnURLForm,
-    Livesearch, ReturnURLForm, SlugField, add_blank_choice,
+    SlugField, add_blank_choice,
 )
 from virtualization.models import VirtualMachine
 from .constants import (
@@ -917,7 +917,7 @@ class VLANFilterForm(BootstrapMixin, CustomFieldFilterForm):
 # Services
 #
 
-class ServiceForm(BootstrapMixin, forms.ModelForm):
+class ServiceForm(BootstrapMixin, CustomFieldForm):
 
     class Meta:
         model = Service
@@ -947,7 +947,10 @@ class ServiceForm(BootstrapMixin, forms.ModelForm):
 
 class ServiceFilterForm(BootstrapMixin, CustomFieldFilterForm):
     model = Service
-    q = forms.CharField(required=False, label='Search')
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
     protocol = forms.ChoiceField(
         choices=add_blank_choice(IP_PROTOCOL_CHOICES),
         required=False
@@ -957,7 +960,7 @@ class ServiceFilterForm(BootstrapMixin, CustomFieldFilterForm):
     )
 
 
-class ServiceBulkEditForm(BootstrapMixin, BulkEditForm):
+class ServiceBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=Service.objects.all(), widget=forms.MultipleHiddenInput)
     protocol = forms.ChoiceField(choices=add_blank_choice(IP_PROTOCOL_CHOICES), required=False)
     port = forms.IntegerField(validators=[MinValueValidator(1), MaxValueValidator(65535)], required=False)

netbox/ipam/models.py

@@ -835,7 +835,7 @@ class VLAN(CreatedUpdatedModel, CustomFieldModel):
 
 
 @python_2_unicode_compatible
-class Service(CreatedUpdatedModel):
+class Service(CreatedUpdatedModel, CustomFieldModel):
     """
     A Service represents a layer-four service (e.g. HTTP or SSH) running on a Device or VirtualMachine. A Service may
     optionally be tied to one or more specific IPAddresses belonging to its parent.
@@ -875,6 +875,11 @@ class Service(CreatedUpdatedModel):
         max_length=100,
         blank=True
     )
+    custom_field_values = GenericRelation(
+        to='extras.CustomFieldValue',
+        content_type_field='obj_type',
+        object_id_field='obj_id'
+    )
 
     serializer = 'ipam.api.serializers.ServiceSerializer'
 

netbox/templates/ipam/service_edit.html

@@ -32,4 +32,12 @@
             {% render_field form.description %}
         </div>
     </div>
+    {% if form.custom_fields %}
+        <div class="panel panel-default">
+            <div class="panel-heading"><strong>Custom Fields</strong></div>
+            <div class="panel-body">
+                {% render_custom_fields form %}
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}

netbox/templates/ipam/service_list.html

@@ -1,6 +1,4 @@
 {% extends '_base.html' %}
-{% load buttons %}
-{% load humanize %}
 
 {% block content %}
 <h1>{% block title %}Services{% endblock %}</h1>