added cable IDs for network, power and console connections netbox-com…

…munity#923

CUSTOM.md

@@ -0,0 +1,6 @@
+postgres=# \c netbox
+Sie sind jetzt verbunden mit der Datenbank »netbox« als Benutzer »postgres«.
+netbox=# ALTER TABLE public.dcim_interfaceconnection ADD COLUMN connection_comments text;
+ALTER TABLE public.dcim_consoleport ADD COLUMN connection_comments text;
+ALTER TABLE public.dcim_powerport ADD COLUMN connection_comments text;
+

netbox/dcim/forms.py

@@ -1300,10 +1300,11 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF
             disabled_indicator='connected_console',
         )
     )
+    connection_comments = forms.CharField(max_length=100, required=False, label='Cable ID')
 
     class Meta:
         model = ConsolePort
-        fields = ['site', 'rack', 'console_server', 'livesearch', 'cs_port', 'connection_status']
+        fields = ['site', 'rack', 'console_server', 'livesearch', 'cs_port', 'connection_status', 'connection_comments']
         labels = {
             'cs_port': 'Port',
             'connection_status': 'Status',
@@ -1565,13 +1566,15 @@ class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor
             disabled_indicator='connected_port'
         )
     )
+    connection_comments = forms.CharField(max_length=100, required=False, label='Cable ID')
 
     class Meta:
         model = PowerPort
-        fields = ['site', 'rack', 'pdu', 'livesearch', 'power_outlet', 'connection_status']
+        fields = ['site', 'rack', 'pdu', 'livesearch', 'power_outlet', 'connection_status', 'connection_comments']
         labels = {
             'power_outlet': 'Outlet',
             'connection_status': 'Status',
+            'connection_comments': 'Cable-ID'
         }
 
     def __init__(self, *args, **kwargs):
@@ -1888,6 +1891,7 @@ class InterfaceBulkDisconnectForm(ConfirmationForm):
 #
 
 class InterfaceConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm):
+    connection_comments = forms.CharField(max_length=100, required=False, label='Cable ID')
     interface_a = forms.ChoiceField(
         choices=[],
         widget=SelectWithDisabled,
@@ -1952,7 +1956,7 @@ class InterfaceConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor
 
     class Meta:
         model = InterfaceConnection
-        fields = ['interface_a', 'site_b', 'rack_b', 'device_b', 'interface_b', 'livesearch', 'connection_status']
+        fields = ['interface_a', 'site_b', 'rack_b', 'device_b', 'interface_b', 'livesearch', 'connection_status', 'connection_comments']
 
     def __init__(self, device_a, *args, **kwargs):
 

netbox/dcim/models.py

@@ -1173,8 +1173,9 @@ class ConsolePort(models.Model):
     cs_port = models.OneToOneField('ConsoleServerPort', related_name='connected_console', on_delete=models.SET_NULL,
                                    verbose_name='Console server port', blank=True, null=True)
     connection_status = models.NullBooleanField(choices=CONNECTION_STATUS_CHOICES, default=CONNECTION_STATUS_CONNECTED)
+    connection_comments = models.TextField(blank=True)
 
-    csv_headers = ['console_server', 'cs_port', 'device', 'console_port', 'connection_status']
+    csv_headers = ['console_server', 'cs_port', 'device', 'console_port', 'connection_comments']
 
     class Meta:
         ordering = ['device', 'name']
@@ -1255,8 +1256,8 @@ class PowerPort(models.Model):
     power_outlet = models.OneToOneField('PowerOutlet', related_name='connected_port', on_delete=models.SET_NULL,
                                         blank=True, null=True)
     connection_status = models.NullBooleanField(choices=CONNECTION_STATUS_CHOICES, default=CONNECTION_STATUS_CONNECTED)
-
-    csv_headers = ['pdu', 'power_outlet', 'device', 'power_port', 'connection_status']
+    connection_comments = models.TextField(blank=True)
+    csv_headers = ['pdu', 'power_outlet', 'device', 'power_port', 'connection_status', 'connection_comments']
 
     class Meta:
         ordering = ['device', 'name']
@@ -1525,10 +1526,11 @@ class InterfaceConnection(models.Model):
     """
     interface_a = models.OneToOneField('Interface', related_name='connected_as_a', on_delete=models.CASCADE)
     interface_b = models.OneToOneField('Interface', related_name='connected_as_b', on_delete=models.CASCADE)
+    connection_comments = models.TextField(blank=True)
     connection_status = models.BooleanField(choices=CONNECTION_STATUS_CHOICES, default=CONNECTION_STATUS_CONNECTED,
                                             verbose_name='Status')
 
-    csv_headers = ['device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status']
+    csv_headers = ['device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status', 'connection_comments']
 
     def clean(self):
         try:

netbox/dcim/views.py

@@ -1145,6 +1145,7 @@ def post(self, request, pk):
             cs_port = consoleport.cs_port
             consoleport.cs_port = None
             consoleport.connection_status = None
+            consoleport.connection_comments = None
             consoleport.save()
             msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
                 consoleport.device.get_absolute_url(),
@@ -1286,6 +1287,7 @@ def post(self, request, pk):
             consoleport = consoleserverport.connected_console
             consoleport.cs_port = None
             consoleport.connection_status = None
+            consoleport.connection_comments = None
             consoleport.save()
             msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
                 consoleport.device.get_absolute_url(),
@@ -1431,6 +1433,7 @@ def post(self, request, pk):
             power_outlet = powerport.power_outlet
             powerport.power_outlet = None
             powerport.connection_status = None
+            powerport.connection_comments = None
             powerport.save()
             msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
                 powerport.device.get_absolute_url(),
@@ -1570,6 +1573,7 @@ def post(self, request, pk):
             powerport = poweroutlet.connected_port
             powerport.power_outlet = None
             powerport.connection_status = None
+            powerport.connection_comments = None
             powerport.save()
             msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
                 powerport.device.get_absolute_url(),

netbox/templates/dcim/consoleport_connect.html

@@ -37,6 +37,7 @@
                     </div>
                     {% render_field form.cs_port %}
                     {% render_field form.connection_status %}
+		    {% render_field form.connection_comments %}
                 </div>
             </div>
             <div class="form-group">

netbox/templates/dcim/device.html

@@ -452,7 +452,7 @@
                             <th>Description</th>
                             <th>MTU</th>
                             <th>MAC Address</th>
-                            <th colspan="2">Connection</th>
+                            <th colspan="3">Connection</th>
                             <th></th>
                         </tr>
                     </thead>
@@ -515,7 +515,7 @@
                                 <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
                             {% endif %}
                             <th>Name</th>
-                            <th colspan="2">Connection</th>
+                            <th colspan="3">Connection</th>
                             <th></th>
                         </tr>
                     </thead>

netbox/templates/dcim/inc/consoleport.html

@@ -9,8 +9,13 @@
         <td>
             {{ cp.cs_port }}
         </td>
+        <td> 
+            {% if cp.connection_comments %}
+            Cable ID: {{ cp.connection_comments }}
+            {% endif %}
+	</td>
     {% else %}
-        <td colspan="2">
+        <td colspan="3">
             <span class="text-muted">Not connected</span>
         </td>
     {% endif %}

netbox/templates/dcim/inc/consoleserverport.html

@@ -14,8 +14,13 @@
         <td>
             {{ csp.connected_console }}
         </td>
+	<td>
+            {% if csp.connected_console.connection_comments %}
+            Cable ID: {{ csp.connected_console.connection_comments }}
+            {% endif %}
+	</td>
     {% else %}
-        <td colspan="2">
+        <td colspan="3">
             <span class="text-muted">Not connected</span>
         </td>
     {% endif %}

netbox/templates/dcim/inc/interface.html

@@ -49,10 +49,15 @@
             <td>
                 <span title="{{ connected_iface.get_form_factor_display }}">{{ connected_iface }}</span>
             </td>
+            <td>
+			{% if iface.connection.connection_comments %}
+			    Cable ID: {{ iface.connection.connection_comments }}
+			{% endif %}
+            </td>
         {% endwith %}
     {% elif iface.circuit_termination %}
         {% with iface.circuit_termination.get_peer_termination as peer_termination %}
-            <td colspan="2">
+            <td colspan="3">
                 <i class="fa fa-fw fa-globe" title="Circuit"></i>
                 {% if peer_termination %}
                     {% if peer_termination.interface %}
@@ -67,7 +72,7 @@
             </td>
         {% endwith %}
     {% else %}
-        <td colspan="2">
+        <td colspan="3">
             <span class="text-muted">Not connected</span>
         </td>
     {% endif %}

netbox/templates/dcim/inc/poweroutlet.html

@@ -13,6 +13,9 @@
         </td>
         <td>
             {{ po.connected_port }}
+            {% if po.connected_port.connection_comments %}
+            Cable ID: {{ po.connected_port.connection_comments }}
+            {% endif %}
         </td>
     {% else %}
         <td colspan="2">

netbox/templates/dcim/inc/powerport.html

@@ -8,9 +8,14 @@
         </td>
         <td>
             {{ pp.power_outlet }}
+	</td>
+	<td>
+            {% if pp.connection_comments %}
+               Cable ID: {{ pp.connection_comments }}
+            {% endif %}
         </td>
     {% else %}
-        <td colspan="2">
+        <td colspan="3">
             <span class="text-muted">Not connected</span>
         </td>
     {% endif %}

netbox/templates/dcim/interfaceconnection_edit.html

@@ -80,6 +80,7 @@ <h1>Connect Interfaces</h1>
     <div class="row">
         <div class="col-md-4 col-md-offset-4">
             {% render_field form.connection_status %}
+            {% render_field form.connection_comments %}
         </div>
     </div>
     <div class="text-center">

netbox/templates/dcim/powerport_connect.html

@@ -37,6 +37,7 @@
                     </div>
                     {% render_field form.power_outlet %}
                     {% render_field form.connection_status %}
+                    {% render_field form.connection_comments %}
                 </div>
             </div>
             <div class="form-group">