From a6904dc5d59865398c66f17ba27d434c9c501308 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 10 Dec 2019 13:24:02 -0500
Subject: [PATCH] Add description field to CircuitType (#3655)

---
 docs/release-notes/version-2.7.md              |  3 ++-
 netbox/circuits/api/serializers.py             |  2 +-
 netbox/circuits/forms.py                       |  2 +-
 .../migrations/0017_circuittype_description.py | 18 ++++++++++++++++++
 netbox/circuits/models.py                      |  7 ++++++-
 netbox/circuits/tables.py                      |  6 ++++--
 6 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 netbox/circuits/migrations/0017_circuittype_description.py

diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md
index 280c13c3d..abcaf36c5 100644
--- a/docs/release-notes/version-2.7.md
+++ b/docs/release-notes/version-2.7.md
@@ -136,13 +136,14 @@ PATCH) to maintain backward compatibility. This behavior will be discontinued be
 * [#3455](https://github.com/digitalocean/netbox/issues/3455) - Add tenant assignment to cluster
 * [#3564](https://github.com/digitalocean/netbox/issues/3564) - Add list views for device components
 * [#3538](https://github.com/digitalocean/netbox/issues/3538) - Introduce a REST API endpoint for executing custom scripts
-* [#3655](https://github.com/digitalocean/netbox/issues/3655) - Add `description` field to rack, device, VLAN/prefix, secret roles
+* [#3655](https://github.com/digitalocean/netbox/issues/3655) - Add `description` field to organizational models
 * [#3731](https://github.com/digitalocean/netbox/issues/3731) - Change Graph.type to a ContentType foreign key field
 
 ## API Changes
 
 * Choice fields now use human-friendly strings for their values instead of integers (see [#3569](https://github.com/netbox-community/netbox/issues/3569)).
 * Introduced `/api/extras/scripts/` endpoint for retrieving and executing custom scripts
+* circuits.CircuitType: Added field `description`
 * dcim.ConsolePort: Added field `type`
 * dcim.ConsolePortTemplate: Added field `type`
 * dcim.ConsoleServerPort: Added field `type`
diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py
index fb63654b1..b22135b3f 100644
--- a/netbox/circuits/api/serializers.py
+++ b/netbox/circuits/api/serializers.py
@@ -36,7 +36,7 @@ class CircuitTypeSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = CircuitType
-        fields = ['id', 'name', 'slug', 'circuit_count']
+        fields = ['id', 'name', 'slug', 'description', 'circuit_count']
 
 
 class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer):
diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index ad99dd40d..a0458aa42 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -128,7 +128,7 @@ class CircuitTypeForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = CircuitType
         fields = [
-            'name', 'slug',
+            'name', 'slug', 'description',
         ]
 
 
diff --git a/netbox/circuits/migrations/0017_circuittype_description.py b/netbox/circuits/migrations/0017_circuittype_description.py
new file mode 100644
index 000000000..4cb5591dd
--- /dev/null
+++ b/netbox/circuits/migrations/0017_circuittype_description.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.6 on 2019-12-10 18:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('circuits', '0016_3569_circuit_fields'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='circuittype',
+            name='description',
+            field=models.CharField(blank=True, max_length=100),
+        ),
+    ]
diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 672e18b62..aabb51ca5 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -98,8 +98,12 @@ class CircuitType(ChangeLoggedModel):
     slug = models.SlugField(
         unique=True
     )
+    description = models.CharField(
+        max_length=100,
+        blank=True,
+    )
 
-    csv_headers = ['name', 'slug']
+    csv_headers = ['name', 'slug', 'description']
 
     class Meta:
         ordering = ['name']
@@ -114,6 +118,7 @@ class CircuitType(ChangeLoggedModel):
         return (
             self.name,
             self.slug,
+            self.description,
         )
 
 
diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py
index d67abdd1a..dbd9e6ba1 100644
--- a/netbox/circuits/tables.py
+++ b/netbox/circuits/tables.py
@@ -50,12 +50,14 @@ class CircuitTypeTable(BaseTable):
     name = tables.LinkColumn()
     circuit_count = tables.Column(verbose_name='Circuits')
     actions = tables.TemplateColumn(
-        template_code=CIRCUITTYPE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name=''
+        template_code=CIRCUITTYPE_ACTIONS,
+        attrs={'td': {'class': 'text-right noprint'}},
+        verbose_name=''
     )
 
     class Meta(BaseTable.Meta):
         model = CircuitType
-        fields = ('pk', 'name', 'circuit_count', 'slug', 'actions')
+        fields = ('pk', 'name', 'circuit_count', 'description', 'slug', 'actions')
 
 
 #