Просмотр исходного кода

Separate VM interface view and template

Jeremy Stretch 5 лет назад
Родитель
Сommit
2608b3f9f3
2 измененных файлов с 152 добавлено и 2 удалено
  1. 120 0
      netbox/templates/virtualization/interface.html
  2. 32 2
      netbox/virtualization/views.py

+ 120 - 0
netbox/templates/virtualization/interface.html

@@ -0,0 +1,120 @@
+{% extends 'base.html' %}
+{% load helpers %}
+
+{% block header %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                {% if interface.device %}
+                    <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
+                {% else %}
+                    <li><a href="{% url 'virtualization:virtualmachine_list' %}">Virtual Machines</a></li>
+                {% endif %}
+                <li><a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a></li>
+                <li>{{ interface }}</li>
+            </ol>
+        </div>
+    </div>
+    <div class="pull-right noprint">
+        {% if perms.dcim.change_interface %}
+            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:interface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
+                <span class="fa fa-pencil" aria-hidden="true"></span> Edit
+            </a>
+        {% endif %}
+        {% if perms.dcim.delete_interface %}
+            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:interface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
+                <span class="fa fa-trash" aria-hidden="true"></span> Delete
+            </a>
+        {% endif %}
+    </div>
+    <h1>{% block title %}{{ interface.parent }} / {{ interface.name }}{% endblock %}</h1>
+    <ul class="nav nav-tabs">
+        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
+            <a href="{{ interface.get_absolute_url }}">Interface</a>
+        </li>
+        {% if perms.extras.view_objectchange %}
+            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
+                <a href="{% url 'dcim:interface_changelog' pk=interface.pk %}">Change Log</a>
+            </li>
+        {% endif %}
+    </ul>
+{% endblock %}
+
+{% block content %}
+<div class="row">
+	<div class="col-md-6">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Interface</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>{% if interface.device %}Device{% else %}Virtual Machine{% endif %}</td>
+                    <td>
+                        <a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Name</td>
+                    <td>{{ interface.name }}</td>
+                </tr>
+                <tr>
+                    <td>Label</td>
+                    <td>{{ interface.label|placeholder }}</td>
+                </tr>
+                <tr>
+                    <td>Type</td>
+                    <td>{{ interface.get_type_display }}</td>
+                </tr>
+                <tr>
+                    <td>Enabled</td>
+                    <td>
+                        {% if interface.enabled %}
+                            <span class="text-success"><i class="fa fa-check"></i></span>
+                        {% else %}
+                            <span class="text-danger"><i class="fa fa-close"></i></span>
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <td>LAG</td>
+                    <td>
+                        {% if interface.lag%}
+                            <a href="{{ interface.lag.get_absolute_url }}">{{ interface.lag }}</a>
+                        {% else %}
+                            <span class="text-muted">None</span>
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <td>Description</td>
+                    <td>{{ interface.description|placeholder }} </td>
+                </tr>
+                <tr>
+                    <td>MTU</td>
+                    <td>{{ interface.mtu|placeholder }}</td>
+                </tr>
+                <tr>
+                    <td>MAC Address</td>
+                    <td>{{ interface.mac_address|placeholder }}</span></td>
+                </tr>
+                <tr>
+                    <td>802.1Q Mode</td>
+                    <td>{{ interface.get_mode_display }}</td>
+                </tr>
+            </table>
+        </div>
+        {% include 'extras/inc/tags_panel.html' with tags=interface.tags.all %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+    </div>
+</div>
+{% endblock %}

+ 32 - 2
netbox/virtualization/views.py

@@ -5,10 +5,10 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 
 from dcim.models import Device
-from dcim.views import InterfaceView as DeviceInterfaceView
 from dcim.tables import DeviceTable
 from extras.views import ObjectConfigContextView
 from ipam.models import Service
+from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from utilities.views import (
     BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, ObjectView,
     ObjectDeleteView, ObjectEditView, ObjectListView,
@@ -297,9 +297,39 @@ class InterfaceListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class InterfaceView(DeviceInterfaceView):
+class InterfaceView(ObjectView):
     queryset = Interface.objects.all()
 
+    def get(self, request, pk):
+
+        interface = get_object_or_404(self.queryset, pk=pk)
+
+        # Get assigned IP addresses
+        ipaddress_table = InterfaceIPAddressTable(
+            data=interface.ipaddresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            orderable=False
+        )
+
+        # Get assigned VLANs and annotate whether each is tagged or untagged
+        vlans = []
+        if interface.untagged_vlan is not None:
+            vlans.append(interface.untagged_vlan)
+            vlans[0].tagged = False
+        for vlan in interface.tagged_vlans.prefetch_related('site', 'group', 'tenant', 'role'):
+            vlan.tagged = True
+            vlans.append(vlan)
+        vlan_table = InterfaceVLANTable(
+            interface=interface,
+            data=vlans,
+            orderable=False
+        )
+
+        return render(request, 'virtualization/interface.html', {
+            'interface': interface,
+            'ipaddress_table': ipaddress_table,
+            'vlan_table': vlan_table,
+        })
+
 
 class InterfaceCreateView(ComponentCreateView):
     queryset = Interface.objects.all()