Removed old console/power connection views

netbox/dcim/urls.py

@@ -161,9 +161,7 @@ urlpatterns = [
     url(r'^devices/console-ports/add/$', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'),
     url(r'^devices/(?P<pk>\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'),
     url(r'^devices/(?P<pk>\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'),
-    # url(r'^console-ports/(?P<pk>\d+)/connect/$', views.ConsolePortConnectView.as_view(), name='consoleport_connect'),
     url(r'^console-ports/(?P<termination_a_id>\d+)/connect/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}),
-    url(r'^console-ports/(?P<pk>\d+)/disconnect/$', views.ConsolePortDisconnectView.as_view(), name='consoleport_disconnect'),
     url(r'^console-ports/(?P<pk>\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'),
     url(r'^console-ports/(?P<pk>\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'),
     url(r'^console-ports/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}),
@@ -173,9 +171,7 @@ urlpatterns = [
     url(r'^devices/(?P<pk>\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'),
     url(r'^devices/(?P<pk>\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'),
     url(r'^devices/(?P<pk>\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'),
-    # url(r'^console-server-ports/(?P<pk>\d+)/connect/$', views.ConsoleServerPortConnectView.as_view(), name='consoleserverport_connect'),
     url(r'^console-server-ports/(?P<termination_a_id>\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}),
-    url(r'^console-server-ports/(?P<pk>\d+)/disconnect/$', views.ConsoleServerPortDisconnectView.as_view(), name='consoleserverport_disconnect'),
     url(r'^console-server-ports/(?P<pk>\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'),
     url(r'^console-server-ports/(?P<pk>\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'),
     url(r'^console-server-ports/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}),
@@ -185,9 +181,7 @@ urlpatterns = [
     url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'),
     url(r'^devices/(?P<pk>\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'),
     url(r'^devices/(?P<pk>\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'),
-    # url(r'^power-ports/(?P<pk>\d+)/connect/$', views.PowerPortConnectView.as_view(), name='powerport_connect'),
     url(r'^power-ports/(?P<termination_a_id>\d+)/connect/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}),
-    url(r'^power-ports/(?P<pk>\d+)/disconnect/$', views.PowerPortDisconnectView.as_view(), name='powerport_disconnect'),
     url(r'^power-ports/(?P<pk>\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'),
     url(r'^power-ports/(?P<pk>\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'),
     url(r'^power-ports/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}),
@@ -197,9 +191,7 @@ urlpatterns = [
     url(r'^devices/(?P<pk>\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'),
     url(r'^devices/(?P<pk>\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'),
     url(r'^devices/(?P<pk>\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'),
-    # url(r'^power-outlets/(?P<pk>\d+)/connect/$', views.PowerOutletConnectView.as_view(), name='poweroutlet_connect'),
     url(r'^power-outlets/(?P<termination_a_id>\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}),
-    url(r'^power-outlets/(?P<pk>\d+)/disconnect/$', views.PowerOutletDisconnectView.as_view(), name='poweroutlet_disconnect'),
     url(r'^power-outlets/(?P<pk>\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'),
     url(r'^power-outlets/(?P<pk>\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'),
     url(r'^power-outlets/(?P<pk>\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}),

netbox/dcim/views.py

@@ -1103,101 +1103,6 @@ class ConsolePortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class ConsolePortConnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_consoleport'
-
-    def get(self, request, pk):
-
-        consoleport = get_object_or_404(ConsolePort, pk=pk)
-        form = forms.ConsolePortConnectionForm(instance=consoleport, initial={
-            'site': request.GET.get('site'),
-            'rack': request.GET.get('rack'),
-            'console_server': request.GET.get('console_server'),
-            'connection_status': CONNECTION_STATUS_CONNECTED,
-        })
-
-        return render(request, 'dcim/consoleport_connect.html', {
-            'consoleport': consoleport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        consoleport = get_object_or_404(ConsolePort, pk=pk)
-        form = forms.ConsolePortConnectionForm(request.POST, instance=consoleport)
-
-        if form.is_valid():
-
-            consoleport = form.save()
-            msg = 'Connected <a href="{}">{}</a> {} to <a href="{}">{}</a> {}'.format(
-                consoleport.device.get_absolute_url(),
-                escape(consoleport.device),
-                escape(consoleport.name),
-                consoleport.connected_endpoint.device.get_absolute_url(),
-                escape(consoleport.connected_endpoint.device),
-                escape(consoleport.connected_endpoint.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=consoleport.device.pk)
-
-        return render(request, 'dcim/consoleport_connect.html', {
-            'consoleport': consoleport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}),
-        })
-
-
-class ConsolePortDisconnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_consoleport'
-
-    def get(self, request, pk):
-
-        consoleport = get_object_or_404(ConsolePort, pk=pk)
-        form = ConfirmationForm()
-
-        if not consoleport.connected_endpoint:
-            messages.warning(
-                request, "Cannot disconnect console port {}: It is not connected to anything.".format(consoleport)
-            )
-            return redirect('dcim:device', pk=consoleport.device.pk)
-
-        return render(request, 'dcim/consoleport_disconnect.html', {
-            'consoleport': consoleport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        consoleport = get_object_or_404(ConsolePort, pk=pk)
-        form = ConfirmationForm(request.POST)
-
-        if form.is_valid():
-            consoleserverport = consoleport.connected_endpoint
-            consoleport.connected_endpoint = None
-            consoleport.connection_status = None
-            consoleport.save()
-            msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
-                consoleport.device.get_absolute_url(),
-                escape(consoleport.device),
-                escape(consoleport.name),
-                consoleserverport.device.get_absolute_url(),
-                escape(consoleserverport.device),
-                escape(consoleserverport.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=consoleport.device.pk)
-
-        return render(request, 'dcim/consoleport_disconnect.html', {
-            'consoleport': consoleport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}),
-        })
-
-
 class ConsolePortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_consoleport'
     model = ConsolePort
@@ -1237,106 +1142,6 @@ class ConsoleServerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class ConsoleServerPortConnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_consoleserverport'
-
-    def get(self, request, pk):
-
-        consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk)
-        form = forms.ConsoleServerPortConnectionForm(initial={
-            'site': request.GET.get('site'),
-            'rack': request.GET.get('rack'),
-            'device': request.GET.get('device'),
-            'connection_status': CONNECTION_STATUS_CONNECTED,
-        })
-
-        return render(request, 'dcim/consoleserverport_connect.html', {
-            'consoleserverport': consoleserverport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk)
-        form = forms.ConsoleServerPortConnectionForm(request.POST)
-
-        if form.is_valid():
-
-            consoleport = form.cleaned_data['port']
-            consoleport.connected_endpoint = consoleserverport
-            consoleport.connection_status = form.cleaned_data['connection_status']
-            consoleport.save()
-            msg = 'Connected <a href="{}">{}</a> {} to <a href="{}">{}</a> {}'.format(
-                consoleport.device.get_absolute_url(),
-                escape(consoleport.device),
-                escape(consoleport.name),
-                consoleserverport.device.get_absolute_url(),
-                escape(consoleserverport.device),
-                escape(consoleserverport.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=consoleserverport.device.pk)
-
-        return render(request, 'dcim/consoleserverport_connect.html', {
-            'consoleserverport': consoleserverport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}),
-        })
-
-
-class ConsoleServerPortDisconnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_consoleserverport'
-
-    def get(self, request, pk):
-
-        consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk)
-        form = ConfirmationForm()
-
-        if not hasattr(consoleserverport, 'connected_endpoint'):
-            messages.warning(
-                request,
-                "Cannot disconnect console server port {}: Nothing is connected to it.".format(consoleserverport)
-            )
-            return redirect('dcim:device', pk=consoleserverport.device.pk)
-
-        return render(request, 'dcim/consoleserverport_disconnect.html', {
-            'consoleserverport': consoleserverport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk)
-        form = ConfirmationForm(request.POST)
-
-        if form.is_valid():
-
-            consoleport = consoleserverport.connected_endpoint
-            consoleport.connected_endpoint = None
-            consoleport.connection_status = None
-            consoleport.save()
-            msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
-                consoleport.device.get_absolute_url(),
-                escape(consoleport.device),
-                escape(consoleport.name),
-                consoleserverport.device.get_absolute_url(),
-                escape(consoleserverport.device),
-                escape(consoleserverport.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=consoleserverport.device.pk)
-
-        return render(request, 'dcim/consoleserverport_disconnect.html', {
-            'consoleserverport': consoleserverport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}),
-        })
-
-
 class ConsoleServerPortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_consoleserverport'
     model = ConsoleServerPort
@@ -1389,102 +1194,6 @@ class PowerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class PowerPortConnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_powerport'
-
-    def get(self, request, pk):
-
-        powerport = get_object_or_404(PowerPort, pk=pk)
-        form = forms.PowerPortConnectionForm(instance=powerport, initial={
-            'site': request.GET.get('site'),
-            'rack': request.GET.get('rack'),
-            'pdu': request.GET.get('pdu'),
-            'connection_status': CONNECTION_STATUS_CONNECTED,
-        })
-
-        return render(request, 'dcim/powerport_connect.html', {
-            'powerport': powerport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        powerport = get_object_or_404(PowerPort, pk=pk)
-        form = forms.PowerPortConnectionForm(request.POST, instance=powerport)
-
-        if form.is_valid():
-
-            powerport = form.save()
-            msg = 'Connected <a href="{}">{}</a> {} to <a href="{}">{}</a> {}'.format(
-                powerport.device.get_absolute_url(),
-                escape(powerport.device),
-                escape(powerport.name),
-                powerport.connected_endpoint.device.get_absolute_url(),
-                escape(powerport.connected_endpoint.device),
-                escape(powerport.connected_endpoint.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=powerport.device.pk)
-
-        return render(request, 'dcim/powerport_connect.html', {
-            'powerport': powerport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}),
-        })
-
-
-class PowerPortDisconnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_powerport'
-
-    def get(self, request, pk):
-
-        powerport = get_object_or_404(PowerPort, pk=pk)
-        form = ConfirmationForm()
-
-        if not powerport.connected_endpoint:
-            messages.warning(
-                request, "Cannot disconnect power port {}: It is not connected to an outlet.".format(powerport)
-            )
-            return redirect('dcim:device', pk=powerport.device.pk)
-
-        return render(request, 'dcim/powerport_disconnect.html', {
-            'powerport': powerport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        powerport = get_object_or_404(PowerPort, pk=pk)
-        form = ConfirmationForm(request.POST)
-
-        if form.is_valid():
-
-            poweroutlet = powerport.connected_endpoint
-            powerport.connected_endpoint = None
-            powerport.connection_status = None
-            powerport.save()
-            msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
-                powerport.device.get_absolute_url(),
-                escape(powerport.device),
-                escape(powerport.name),
-                poweroutlet.device.get_absolute_url(),
-                escape(poweroutlet.device),
-                escape(poweroutlet.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=powerport.device.pk)
-
-        return render(request, 'dcim/powerport_disconnect.html', {
-            'powerport': powerport,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}),
-        })
-
-
 class PowerPortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_powerport'
     model = PowerPort
@@ -1524,104 +1233,6 @@ class PowerOutletCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class PowerOutletConnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_poweroutlet'
-
-    def get(self, request, pk):
-
-        poweroutlet = get_object_or_404(PowerOutlet, pk=pk)
-        form = forms.PowerOutletConnectionForm(initial={
-            'site': request.GET.get('site'),
-            'rack': request.GET.get('rack'),
-            'device': request.GET.get('device'),
-            'connection_status': CONNECTION_STATUS_CONNECTED,
-        })
-
-        return render(request, 'dcim/poweroutlet_connect.html', {
-            'poweroutlet': poweroutlet,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        poweroutlet = get_object_or_404(PowerOutlet, pk=pk)
-        form = forms.PowerOutletConnectionForm(request.POST)
-
-        if form.is_valid():
-            powerport = form.cleaned_data['port']
-            powerport.connected_endpoint = poweroutlet
-            powerport.connection_status = form.cleaned_data['connection_status']
-            powerport.save()
-            msg = 'Connected <a href="{}">{}</a> {} to <a href="{}">{}</a> {}'.format(
-                powerport.device.get_absolute_url(),
-                escape(powerport.device),
-                escape(powerport.name),
-                poweroutlet.device.get_absolute_url(),
-                escape(poweroutlet.device),
-                escape(poweroutlet.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=poweroutlet.device.pk)
-
-        return render(request, 'dcim/poweroutlet_connect.html', {
-            'poweroutlet': poweroutlet,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}),
-        })
-
-
-class PowerOutletDisconnectView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_poweroutlet'
-
-    def get(self, request, pk):
-
-        poweroutlet = get_object_or_404(PowerOutlet, pk=pk)
-        form = ConfirmationForm()
-
-        if not hasattr(poweroutlet, 'connected_endpoint'):
-            messages.warning(
-                request, "Cannot disconnect power outlet {}: Nothing is connected to it.".format(poweroutlet)
-            )
-            return redirect('dcim:device', pk=poweroutlet.device.pk)
-
-        return render(request, 'dcim/poweroutlet_disconnect.html', {
-            'poweroutlet': poweroutlet,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}),
-        })
-
-    def post(self, request, pk):
-
-        poweroutlet = get_object_or_404(PowerOutlet, pk=pk)
-        form = ConfirmationForm(request.POST)
-
-        if form.is_valid():
-
-            powerport = poweroutlet.connected_endpoint
-            powerport.connected_endpoint = None
-            powerport.connection_status = None
-            powerport.save()
-            msg = 'Disconnected <a href="{}">{}</a> {} from <a href="{}">{}</a> {}'.format(
-                powerport.device.get_absolute_url(),
-                escape(powerport.device),
-                escape(powerport.name),
-                poweroutlet.device.get_absolute_url(),
-                escape(poweroutlet.device),
-                escape(poweroutlet.name),
-            )
-            messages.success(request, mark_safe(msg))
-
-            return redirect('dcim:device', pk=poweroutlet.device.pk)
-
-        return render(request, 'dcim/poweroutlet_disconnect.html', {
-            'poweroutlet': poweroutlet,
-            'form': form,
-            'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}),
-        })
-
-
 class PowerOutletEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_poweroutlet'
     model = PowerOutlet

netbox/templates/dcim/consoleport_connect.html

@@ -1,55 +0,0 @@
-{% extends '_base.html' %}
-{% load static from staticfiles %}
-{% load form_helpers %}
-
-{% block content %}
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    {% for field in form.hidden_fields %}
-        {{ field }}
-    {% endfor %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
-            <div class="panel panel-default">
-                <div class="panel-heading">{% block title %}Connect {{ consoleport.device }} {{ consoleport }}{% endblock %}</div>
-                <div class="panel-body">
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
-                        <li role="presentation"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">Select</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="search">
-                            {% render_field form.livesearch %}
-                        </div>
-                        <div class="tab-pane" id="select">
-                            {% render_field form.site %}
-                            {% render_field form.rack %}
-                            {% render_field form.console_server %}
-                        </div>
-                    </div>
-                    {% render_field form.connected_endpoint %}
-                    {% render_field form.connection_status %}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <button type="submit" name="_update" class="btn btn-primary">Connect</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}

netbox/templates/dcim/consoleport_disconnect.html

@@ -1,8 +0,0 @@
-{% extends 'utilities/confirmation_form.html' %}
-{% load form_helpers %}
-
-{% block title %}Disconnect console port {{ consoleport }}?{% endblock %}
-
-{% block message %}
-    <p>Are you sure you want to disconnect this console port from {{ consoleport.connected_endpoint.device }} {{ consoleport.connected_endpoint }}?</p>
-{% endblock %}

netbox/templates/dcim/consoleserverport_connect.html

@@ -1,55 +0,0 @@
-{% extends '_base.html' %}
-{% load static from staticfiles %}
-{% load form_helpers %}
-
-{% block content %}
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    {% for field in form.hidden_fields %}
-        {{ field }}
-    {% endfor %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
-            <div class="panel panel-default">
-                <div class="panel-heading">{% block title %}Connect {{ consoleserverport.device }} {{ consoleserverport }}{% endblock %}</div>
-                <div class="panel-body">
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
-                        <li role="presentation"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">Select</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="search">
-                            {% render_field form.livesearch %}
-                        </div>
-                        <div class="tab-pane" id="select">
-                            {% render_field form.site %}
-                            {% render_field form.rack %}
-                            {% render_field form.device %}
-                        </div>
-                    </div>
-                    {% render_field form.port %}
-                    {% render_field form.connection_status %}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <button type="submit" name="_update" class="btn btn-primary">Connect</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}

netbox/templates/dcim/consoleserverport_disconnect.html

@@ -1,8 +0,0 @@
-{% extends 'utilities/confirmation_form.html' %}
-{% load form_helpers %}
-
-{% block title %}Disconnect {{ consoleserverport.device }} {{ consoleserverport }}?{% endblock %}
-
-{% block message %}
-    <p>Are you sure you want to disconnect {{ consoleserverport.connected_endpoint.device }} {{ consoleserverport.connected_endpoint }} from this port?</p>
-{% endblock %}

netbox/templates/dcim/inc/consoleport.html

@@ -41,7 +41,7 @@
                         <i class="fa fa-plug" aria-hidden="true"></i>
                     </a>
                 {% endif %}
-                <a href="{% url 'dcim:consoleport_disconnect' pk=cp.pk %}" title="Delete connection" class="btn btn-danger btn-xs">
+                <a href="{% url 'dcim:cable_delete' pk=cp.cable.pk %}" title="Remove cable" class="btn btn-danger btn-xs">
                     <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
                 </a>
             {% else %}

netbox/templates/dcim/inc/consoleserverport.html

@@ -48,7 +48,7 @@
                         <i class="fa fa-plug" aria-hidden="true"></i>
                     </a>
                 {% endif %}
-                <a href="{% url 'dcim:consoleserverport_disconnect' pk=csp.pk %}" title="Delete connection" class="btn btn-danger btn-xs">
+                <a href="{% url 'dcim:cable_delete' pk=csp.cable.pk %}" title="Remove cable" class="btn btn-danger btn-xs">
                     <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
                 </a>
             {% else %}

netbox/templates/dcim/inc/poweroutlet.html

@@ -48,7 +48,7 @@
                         <i class="fa fa-plug" aria-hidden="true"></i>
                     </a>
                 {% endif %}
-                <a href="{% url 'dcim:poweroutlet_disconnect' pk=po.pk %}" title="Delete connection" class="btn btn-danger btn-xs">
+                <a href="{% url 'dcim:cable_delete' pk=po.cable.pk %}" title="Remove cable" class="btn btn-danger btn-xs">
                     <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
                 </a>
             {% else %}

netbox/templates/dcim/inc/powerport.html

@@ -41,9 +41,9 @@
                         <i class="fa fa-plug" aria-hidden="true"></i>
                     </a>
                 {% endif %}
-            <a href="{% url 'dcim:powerport_disconnect' pk=pp.pk %}" title="Delete connection" class="btn btn-danger btn-xs">
+                <a href="{% url 'dcim:cable_delete' pk=pp.cable.pk %}" title="Remove cable" class="btn btn-danger btn-xs">
-                <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
+                    <i class="glyphicon glyphicon-resize-full" aria-hidden="true"></i>
-            </a>
+                </a>
             {% else %}
                 <a href="{% url 'dcim:powerport_connect' termination_a_id=pp.pk %}" title="Connect" class="btn btn-success btn-xs">
                     <i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i>

netbox/templates/dcim/interfaceconnection_delete.html

@@ -1,12 +0,0 @@
-{% extends 'utilities/confirmation_form.html' %}
-{% load form_helpers %}
-
-{% block title %}Delete interface connection?{% endblock %}
-
-{% block message %}
-    <p>Are you sure you want to delete the connection between these two interfaces?</p>
-    <ul>
-        <li>{{ interfaceconnection.interface_a.device }}: {{ interfaceconnection.interface_a }}</li>
-        <li>{{ interfaceconnection.interface_b.device }}: {{ interfaceconnection.interface_b }}</li>
-    </ul>
-{% endblock %}

netbox/templates/dcim/interfaceconnection_edit.html

@@ -1,97 +0,0 @@
-{% extends '_base.html' %}
-{% load static from staticfiles %}
-{% load form_helpers %}
-
-{% block title %}Connect Interfaces{% endblock %}
-
-{% block content %}
-<h1>Connect Interfaces</h1>
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-5">
-            <div class="panel panel-default">
-                <div class="panel-heading text-center">
-                    <strong>A Side</strong>
-                </div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-md-3 control-label required">Site</label>
-                        <div class="col-md-9">
-                            <p class="form-control-static">{{ device.site }}</p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label required">Rack</label>
-                        <div class="col-md-9">
-                            <p class="form-control-static">{{ device.rack|default:"None" }}</p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label required">Device</label>
-                        <div class="col-md-9">
-                            <p class="form-control-static">{{ device }}</p>
-                        </div>
-                    </div>
-                    {% render_field form.interface_a %}
-                </div>
-            </div>
-        </div>
-        <div class="col-md-2 text-center" style="padding-top: 90px;">
-            <i class="fa fa-exchange fa-4x"></i>
-        </div>
-        <div class="col-md-5">
-            <div class="panel panel-default">
-                <div class="panel-heading text-center">
-                    <strong>B Side</strong>
-                </div>
-                <div class="panel-body">
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
-                        <li role="presentation"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">Select</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="search">
-                            {% render_field form.livesearch %}
-                        </div>
-                        <div class="tab-pane" id="select">
-                            {% render_field form.site_b %}
-                            {% render_field form.rack_b %}
-                            {% render_field form.device_b %}
-                        </div>
-                    </div>
-                    {% render_field form.interface_b %}
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-4 col-md-offset-4">
-            {% render_field form.connection_status %}
-        </div>
-    </div>
-    <div class="text-center">
-        <div class="form-group">
-            <button type="submit" name="_create" class="btn btn-primary">Connect</button>
-            <button type="submit" name="_addanother" class="btn btn-primary">Connect and Add Another</button>
-            <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}

netbox/templates/dcim/poweroutlet_connect.html

@@ -1,55 +0,0 @@
-{% extends '_base.html' %}
-{% load static from staticfiles %}
-{% load form_helpers %}
-
-{% block content %}
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    {% for field in form.hidden_fields %}
-        {{ field }}
-    {% endfor %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
-            <div class="panel panel-default">
-                <div class="panel-heading">{% block title %}Connect {{ poweroutlet.device }} {{ poweroutlet }}{% endblock %}</div>
-                <div class="panel-body">
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
-                        <li role="presentation"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">Select</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="search">
-                            {% render_field form.livesearch %}
-                        </div>
-                        <div class="tab-pane" id="select">
-                            {% render_field form.site %}
-                            {% render_field form.rack %}
-                            {% render_field form.device %}
-                        </div>
-                    </div>
-                    {% render_field form.port %}
-                    {% render_field form.connection_status %}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <button type="submit" name="_update" class="btn btn-primary">Connect</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}

netbox/templates/dcim/poweroutlet_disconnect.html

@@ -1,8 +0,0 @@
-{% extends 'utilities/confirmation_form.html' %}
-{% load form_helpers %}
-
-{% block title %}Disconnect {{ poweroutlet.device }} {{ poweroutlet }}?{% endblock %}
-
-{% block message %}
-    <p>Are you sure you want to disconnect {{ poweroutlet.connected_endpoint.device }} {{ poweroutlet.connected_endpoint }} from this port?</p>
-{% endblock %}

netbox/templates/dcim/powerport_connect.html

@@ -1,55 +0,0 @@
-{% extends '_base.html' %}
-{% load static from staticfiles %}
-{% load form_helpers %}
-
-{% block content %}
-<form action="." method="post" class="form form-horizontal">
-    {% csrf_token %}
-    {% for field in form.hidden_fields %}
-        {{ field }}
-    {% endfor %}
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            {% if form.non_field_errors %}
-                <div class="panel panel-danger">
-                    <div class="panel-heading"><strong>Errors</strong></div>
-                    <div class="panel-body">
-                        {{ form.non_field_errors }}
-                    </div>
-                </div>
-            {% endif %}
-            <div class="panel panel-default">
-                <div class="panel-heading">{% block title %}Connect {{ powerport.device }} {{ powerport }}{% endblock %}</div>
-                <div class="panel-body">
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
-                        <li role="presentation"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">Select</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="search">
-                            {% render_field form.livesearch %}
-                        </div>
-                        <div class="tab-pane" id="select">
-                            {% render_field form.site %}
-                            {% render_field form.rack %}
-                            {% render_field form.pdu %}
-                        </div>
-                    </div>
-                    {% render_field form.connected_endpoint %}
-                    {% render_field form.connection_status %}
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <button type="submit" name="_update" class="btn btn-primary">Connect</button>
-		            <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}

netbox/templates/dcim/powerport_disconnect.html

@@ -1,8 +0,0 @@
-{% extends 'utilities/confirmation_form.html' %}
-{% load form_helpers %}
-
-{% block title %}Disconnect power port {{ powerport }}?{% endblock %}
-
-{% block message %}
-    <p>Are you sure you want to disconnect this power port from {{ powerport.connected_endpoint.device }} {{ powerport.connected_endpoint }}?</p>
-{% endblock %}