diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html
index a771dfbd9..30ed76dae 100644
--- a/netbox/templates/virtualization/virtualmachine_list.html
+++ b/netbox/templates/virtualization/virtualmachine_list.html
@@ -1,18 +1,13 @@
{% extends '_base.html' %}
+{% load buttons %}
{% block content %}
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 00194d4e8..4ea6c57ba 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -27,7 +27,7 @@ class TenantGroupCSVForm(forms.ModelForm):
class Meta:
model = TenantGroup
- fields = ['name', 'slug']
+ fields = TenantGroup.csv_headers
help_texts = {
'name': 'Group name',
}
@@ -60,7 +60,7 @@ class TenantCSVForm(forms.ModelForm):
class Meta:
model = Tenant
- fields = ['name', 'slug', 'group', 'description', 'comments']
+ fields = Tenant.csv_headers
help_texts = {
'name': 'Tenant name',
'comments': 'Free-form comments'
diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py
index a43327a06..1fea2ceaf 100644
--- a/netbox/tenancy/models.py
+++ b/netbox/tenancy/models.py
@@ -7,7 +7,6 @@ from django.utils.encoding import python_2_unicode_compatible
from extras.models import CustomFieldModel, CustomFieldValue
from utilities.models import CreatedUpdatedModel
-from utilities.utils import csv_format
@python_2_unicode_compatible
@@ -18,6 +17,8 @@ class TenantGroup(models.Model):
name = models.CharField(max_length=50, unique=True)
slug = models.SlugField(unique=True)
+ csv_headers = ['name', 'slug']
+
class Meta:
ordering = ['name']
@@ -27,6 +28,12 @@ class TenantGroup(models.Model):
def get_absolute_url(self):
return "{}?group={}".format(reverse('tenancy:tenant_list'), self.slug)
+ def to_csv(self):
+ return (
+ self.name,
+ self.slug,
+ )
+
@python_2_unicode_compatible
class Tenant(CreatedUpdatedModel, CustomFieldModel):
@@ -41,7 +48,7 @@ class Tenant(CreatedUpdatedModel, CustomFieldModel):
comments = models.TextField(blank=True)
custom_field_values = GenericRelation(CustomFieldValue, content_type_field='obj_type', object_id_field='obj_id')
- csv_headers = ['name', 'slug', 'group', 'description']
+ csv_headers = ['name', 'slug', 'group', 'description', 'comments']
class Meta:
ordering = ['group', 'name']
@@ -53,9 +60,10 @@ class Tenant(CreatedUpdatedModel, CustomFieldModel):
return reverse('tenancy:tenant', args=[self.slug])
def to_csv(self):
- return csv_format([
+ return (
self.name,
self.slug,
self.group.name if self.group else None,
self.description,
- ])
+ self.comments,
+ )
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 1817cd9a9..a20825d13 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -1,7 +1,7 @@
from __future__ import unicode_literals
import csv
-import itertools
+from io import StringIO
import re
from django import forms
@@ -245,14 +245,10 @@ class CSVDataField(forms.CharField):
def to_python(self, value):
- # Python 2's csv module has problems with Unicode
- if not isinstance(value, str):
- value = value.encode('utf-8')
-
records = []
- reader = csv.reader(value.splitlines())
+ reader = csv.reader(StringIO(value))
- # Consume and valdiate the first line of CSV data as column headers
+ # Consume and validate the first line of CSV data as column headers
headers = next(reader)
for f in self.required_fields:
if f not in headers:
diff --git a/netbox/utilities/templates/buttons/add.html b/netbox/utilities/templates/buttons/add.html
new file mode 100644
index 000000000..a5278ae12
--- /dev/null
+++ b/netbox/utilities/templates/buttons/add.html
@@ -0,0 +1,3 @@
+
+
diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html
new file mode 100644
index 000000000..ee76dae6c
--- /dev/null
+++ b/netbox/utilities/templates/buttons/export.html
@@ -0,0 +1,19 @@
+{% if export_templates %}
+
+
+
+
+
+{% else %}
+
+
+{% endif %}
\ No newline at end of file
diff --git a/netbox/utilities/templates/buttons/import.html b/netbox/utilities/templates/buttons/import.html
new file mode 100644
index 000000000..67be77871
--- /dev/null
+++ b/netbox/utilities/templates/buttons/import.html
@@ -0,0 +1,3 @@
+
+
diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py
new file mode 100644
index 000000000..3090f4538
--- /dev/null
+++ b/netbox/utilities/templatetags/buttons.py
@@ -0,0 +1,26 @@
+from __future__ import unicode_literals
+
+from django import template
+
+from extras.models import ExportTemplate
+
+register = template.Library()
+
+
+@register.inclusion_tag('buttons/add.html')
+def add_button(url):
+ return {'add_url': url}
+
+
+@register.inclusion_tag('buttons/import.html')
+def import_button(url):
+ return {'import_url': url}
+
+
+@register.inclusion_tag('buttons/export.html', takes_context=True)
+def export_button(context, content_type=None):
+ export_templates = ExportTemplate.objects.filter(content_type=content_type)
+ return {
+ 'url_params': context['request'].GET,
+ 'export_templates': export_templates,
+ }
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 72da778a5..c08bfef8c 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -1,7 +1,10 @@
from __future__ import unicode_literals
+import datetime
import six
+from django.http import HttpResponse
+
def csv_format(data):
"""
@@ -15,12 +18,16 @@ def csv_format(data):
csv.append('')
continue
+ # Convert dates to ISO format
+ if isinstance(value, (datetime.date, datetime.datetime)):
+ value = value.isoformat()
+
# Force conversion to string first so we can check for any commas
if not isinstance(value, six.string_types):
value = '{}'.format(value)
# Double-quote the value if it contains a comma
- if ',' in value:
+ if ',' in value or '\n' in value:
csv.append('"{}"'.format(value))
else:
csv.append('{}'.format(value))
@@ -28,6 +35,32 @@ def csv_format(data):
return ','.join(csv)
+def queryset_to_csv(queryset):
+ """
+ Export a queryset of objects as CSV, using the model's to_csv() method.
+ """
+ output = []
+
+ # Start with the column headers
+ headers = ','.join(queryset.model.csv_headers)
+ output.append(headers)
+
+ # Iterate through the queryset
+ for obj in queryset:
+ data = csv_format(obj.to_csv())
+ output.append(data)
+
+ # Build the HTTP response
+ response = HttpResponse(
+ '\n'.join(output),
+ content_type='text/csv'
+ )
+ filename = 'netbox_{}.csv'.format(queryset.model._meta.verbose_name_plural)
+ response['Content-Disposition'] = 'attachment; filename="{}"'.format(filename)
+
+ return response
+
+
def foreground_color(bg_color):
"""
Return the ideal foreground color (black or white) for a given background color in hexadecimal RGB format.
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index d37332bef..7e1a34e19 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -10,7 +10,6 @@ from django.core.exceptions import ValidationError
from django.db import transaction, IntegrityError
from django.db.models import ProtectedError
from django.forms import CharField, Form, ModelMultipleChoiceField, MultipleHiddenInput, Textarea, TypedChoiceField
-from django.http import HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.template import TemplateSyntaxError
from django.urls import reverse
@@ -21,6 +20,7 @@ from django.views.generic import View
from django_tables2 import RequestConfig
from extras.models import CustomField, CustomFieldValue, ExportTemplate, UserAction
+from utilities.utils import queryset_to_csv
from utilities.forms import BootstrapMixin, CSVDataField
from .error_handlers import handle_protectederror
from .forms import ConfirmationForm
@@ -79,7 +79,7 @@ class ObjectListView(View):
def get(self, request):
model = self.queryset.model
- object_ct = ContentType.objects.get_for_model(model)
+ content_type = ContentType.objects.get_for_model(model)
if self.filter:
self.queryset = self.filter(request.GET, self.queryset).qs
@@ -92,27 +92,18 @@ class ObjectListView(View):
# Check for export template rendering
if request.GET.get('export'):
- et = get_object_or_404(ExportTemplate, content_type=object_ct, name=request.GET.get('export'))
+ et = get_object_or_404(ExportTemplate, content_type=content_type, name=request.GET.get('export'))
queryset = CustomFieldQueryset(self.queryset, custom_fields) if custom_fields else self.queryset
try:
- response = et.to_response(context_dict={'queryset': queryset},
- filename='netbox_{}'.format(model._meta.verbose_name_plural))
- return response
+ return et.render_to_response(queryset)
except TemplateSyntaxError:
- messages.error(request, "There was an error rendering the selected export template ({})."
- .format(et.name))
- # Fall back to built-in CSV export
+ messages.error(
+ request,
+ "There was an error rendering the selected export template ({}).".format(et.name)
+ )
+ # Fall back to built-in CSV export if no template was specified
elif 'export' in request.GET and hasattr(model, 'to_csv'):
- headers = getattr(model, 'csv_headers', None)
- output = ','.join(headers) + '\n' if headers else ''
- output += '\n'.join([obj.to_csv() for obj in self.queryset])
- response = HttpResponse(
- output,
- content_type='text/csv'
- )
- response['Content-Disposition'] = 'attachment; filename="netbox_{}.csv"'\
- .format(self.queryset.model._meta.verbose_name_plural)
- return response
+ return queryset_to_csv(self.queryset)
# Provide a hook to tweak the queryset based on the request immediately prior to rendering the object list
self.queryset = self.alter_queryset(request)
@@ -134,10 +125,10 @@ class ObjectListView(View):
RequestConfig(request, paginate).configure(table)
context = {
+ 'content_type': content_type,
'table': table,
'permissions': permissions,
'filter_form': self.filter_form(request.GET, label_suffix='') if self.filter_form else None,
- 'export_templates': ExportTemplate.objects.filter(content_type=object_ct),
}
context.update(self.extra_context())
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index d697de755..ae2987775 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -9,6 +9,7 @@ from dcim.constants import IFACE_FF_VIRTUAL
from dcim.formfields import MACAddressFormField
from dcim.models import Device, DeviceRole, Interface, Platform, Rack, Region, Site
from extras.forms import CustomFieldBulkEditForm, CustomFieldForm, CustomFieldFilterForm
+from ipam.models import IPAddress
from tenancy.forms import TenancyForm
from tenancy.models import Tenant
from utilities.forms import (
@@ -41,7 +42,7 @@ class ClusterTypeCSVForm(forms.ModelForm):
class Meta:
model = ClusterType
- fields = ['name', 'slug']
+ fields = ClusterType.csv_headers
help_texts = {
'name': 'Name of cluster type',
}
@@ -64,7 +65,7 @@ class ClusterGroupCSVForm(forms.ModelForm):
class Meta:
model = ClusterGroup
- fields = ['name', 'slug']
+ fields = ClusterGroup.csv_headers
help_texts = {
'name': 'Name of cluster group',
}
@@ -112,7 +113,7 @@ class ClusterCSVForm(forms.ModelForm):
class Meta:
model = Cluster
- fields = ['name', 'type', 'group', 'site', 'comments']
+ fields = Cluster.csv_headers
class ClusterBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
@@ -246,8 +247,8 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
class Meta:
model = VirtualMachine
fields = [
- 'name', 'status', 'cluster_group', 'cluster', 'role', 'tenant', 'platform', 'vcpus', 'memory', 'disk',
- 'comments',
+ 'name', 'status', 'cluster_group', 'cluster', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
+ 'vcpus', 'memory', 'disk', 'comments',
]
def __init__(self, *args, **kwargs):
@@ -261,6 +262,41 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
super(VirtualMachineForm, self).__init__(*args, **kwargs)
+ if self.instance.pk:
+
+ # Compile list of choices for primary IPv4 and IPv6 addresses
+ for family in [4, 6]:
+ ip_choices = [(None, '---------')]
+ # Collect interface IPs
+ interface_ips = IPAddress.objects.select_related('interface').filter(
+ family=family, interface__virtual_machine=self.instance
+ )
+ if interface_ips:
+ ip_choices.append(
+ ('Interface IPs', [
+ (ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips
+ ])
+ )
+ # Collect NAT IPs
+ nat_ips = IPAddress.objects.select_related('nat_inside').filter(
+ family=family, nat_inside__interface__virtual_machine=self.instance
+ )
+ if nat_ips:
+ ip_choices.append(
+ ('NAT IPs', [
+ (ip.id, '{} ({})'.format(ip.address, ip.nat_inside.address)) for ip in nat_ips
+ ])
+ )
+ self.fields['primary_ip{}'.format(family)].choices = ip_choices
+
+ else:
+
+ # An object that doesn't exist yet can't have any IPs assigned to it
+ self.fields['primary_ip4'].choices = []
+ self.fields['primary_ip4'].widget.attrs['readonly'] = True
+ self.fields['primary_ip6'].choices = []
+ self.fields['primary_ip6'].widget.attrs['readonly'] = True
+
class VirtualMachineCSVForm(forms.ModelForm):
status = CSVChoiceField(
@@ -306,7 +342,7 @@ class VirtualMachineCSVForm(forms.ModelForm):
class Meta:
model = VirtualMachine
- fields = ['name', 'status', 'cluster', 'role', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments']
+ fields = VirtualMachine.csv_headers
class VirtualMachineBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 8152c5d57..5552fb089 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -10,7 +10,6 @@ from django.utils.encoding import python_2_unicode_compatible
from dcim.models import Device
from extras.models import CustomFieldModel, CustomFieldValue
from utilities.models import CreatedUpdatedModel
-from utilities.utils import csv_format
from .constants import STATUS_ACTIVE, STATUS_CHOICES, VM_STATUS_CLASSES
@@ -31,6 +30,8 @@ class ClusterType(models.Model):
unique=True
)
+ csv_headers = ['name', 'slug']
+
class Meta:
ordering = ['name']
@@ -40,6 +41,12 @@ class ClusterType(models.Model):
def get_absolute_url(self):
return "{}?type={}".format(reverse('virtualization:cluster_list'), self.slug)
+ def to_csv(self):
+ return (
+ self.name,
+ self.slug,
+ )
+
#
# Cluster groups
@@ -58,6 +65,8 @@ class ClusterGroup(models.Model):
unique=True
)
+ csv_headers = ['name', 'slug']
+
class Meta:
ordering = ['name']
@@ -67,6 +76,12 @@ class ClusterGroup(models.Model):
def get_absolute_url(self):
return "{}?group={}".format(reverse('virtualization:cluster_list'), self.slug)
+ def to_csv(self):
+ return (
+ self.name,
+ self.slug,
+ )
+
#
# Clusters
@@ -109,9 +124,7 @@ class Cluster(CreatedUpdatedModel, CustomFieldModel):
object_id_field='obj_id'
)
- csv_headers = [
- 'name', 'type', 'group', 'site', 'comments',
- ]
+ csv_headers = ['name', 'type', 'group', 'site', 'comments']
class Meta:
ordering = ['name']
@@ -135,13 +148,13 @@ class Cluster(CreatedUpdatedModel, CustomFieldModel):
})
def to_csv(self):
- return csv_format([
+ return (
self.name,
self.type.name,
self.group.name if self.group else None,
self.site.name if self.site else None,
self.comments,
- ])
+ )
#
@@ -230,7 +243,7 @@ class VirtualMachine(CreatedUpdatedModel, CustomFieldModel):
)
csv_headers = [
- 'name', 'status', 'cluster', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments',
+ 'name', 'status', 'role', 'cluster', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments',
]
class Meta:
@@ -243,9 +256,10 @@ class VirtualMachine(CreatedUpdatedModel, CustomFieldModel):
return reverse('virtualization:virtualmachine', args=[self.pk])
def to_csv(self):
- return csv_format([
+ return (
self.name,
self.get_status_display(),
+ self.role.name if self.role else None,
self.cluster.name,
self.tenant.name if self.tenant else None,
self.platform.name if self.platform else None,
@@ -253,7 +267,7 @@ class VirtualMachine(CreatedUpdatedModel, CustomFieldModel):
self.memory,
self.disk,
self.comments,
- ])
+ )
def get_status_class(self):
return VM_STATUS_CLASSES[self.status]
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index 2ace86d77..4d38a3fe5 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -80,8 +80,9 @@ class ClusterGroupTable(BaseTable):
class ClusterTable(BaseTable):
pk = ToggleColumn()
name = tables.LinkColumn()
- device_count = tables.Column(verbose_name='Devices')
- vm_count = tables.Column(verbose_name='VMs')
+ site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')])
+ device_count = tables.Column(accessor=Accessor('devices.count'), orderable=False, verbose_name='Devices')
+ vm_count = tables.Column(accessor=Accessor('virtual_machines.count'), orderable=False, verbose_name='VMs')
class Meta(BaseTable.Meta):
model = Cluster
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 4f2981748..119388dd9 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -99,10 +99,7 @@ class ClusterGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
#
class ClusterListView(ObjectListView):
- queryset = Cluster.objects.annotate(
- device_count=Count('devices', distinct=True),
- vm_count=Count('virtual_machines', distinct=True)
- )
+ queryset = Cluster.objects.select_related('type', 'group')
table = tables.ClusterTable
filter = filters.ClusterFilter
filter_form = forms.ClusterFilterForm
@@ -162,10 +159,7 @@ class ClusterBulkEditView(PermissionRequiredMixin, BulkEditView):
class ClusterBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
permission_required = 'virtualization.delete_cluster'
cls = Cluster
- queryset = Cluster.objects.annotate(
- device_count=Count('devices', distinct=True),
- vm_count=Count('virtual_machines', distinct=True)
- )
+ queryset = Cluster.objects.all()
table = tables.ClusterTable
default_return_url = 'virtualization:cluster_list'