Tags
diff --git a/netbox/tenancy/api/views.py b/netbox/tenancy/api/views.py
index febf86a529..b47a0cd63f 100644
--- a/netbox/tenancy/api/views.py
+++ b/netbox/tenancy/api/views.py
@@ -28,6 +28,6 @@ class TenantGroupViewSet(ModelViewSet):
#
class TenantViewSet(CustomFieldModelViewSet):
- queryset = Tenant.objects.select_related('group')
+ queryset = Tenant.objects.select_related('group').prefetch_related('tags')
serializer_class = serializers.TenantSerializer
filter_class = filters.TenantFilter
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 09b313ab6c..ac8597dc52 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -1,10 +1,11 @@
import csv
from io import StringIO
+import json
import re
from django import forms
from django.conf import settings
-from django.contrib.postgres.forms import JSONField as _JSONField
+from django.contrib.postgres.forms.jsonb import JSONField as _JSONField, InvalidJSONInput
from django.db.models import Count
from django.urls import reverse_lazy
from mptt.forms import TreeNodeMultipleChoiceField
@@ -554,9 +555,11 @@ class JSONField(_JSONField):
self.widget.attrs['placeholder'] = ''
def prepare_value(self, value):
+ if isinstance(value, InvalidJSONInput):
+ return value
if value is None:
return ''
- return super(JSONField, self).prepare_value(value)
+ return json.dumps(value, sort_keys=True, indent=4)
#
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 10e54717c9..df0ca63cf6 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -708,22 +708,17 @@ class ComponentCreateView(View):
if form.is_valid():
new_components = []
- data = deepcopy(form.cleaned_data)
+ data = deepcopy(request.POST)
+ data[self.parent_field] = parent.pk
for name in form.cleaned_data['name_pattern']:
- component_data = {
- self.parent_field: parent.pk,
- 'name': name,
- }
- # Replace objects with their primary key to keep component_form.clean() happy
- for k, v in data.items():
- if hasattr(v, 'pk'):
- component_data[k] = v.pk
- else:
- component_data[k] = v
- component_form = self.model_form(component_data)
+
+ # Initialize the individual component form
+ data['name'] = name
+ component_form = self.model_form(data)
+
if component_form.is_valid():
- new_components.append(component_form.save(commit=False))
+ new_components.append(component_form)
else:
for field, errors in component_form.errors.as_data().items():
# Assign errors on the child form's name field to name_pattern on the parent form
@@ -733,26 +728,10 @@ class ComponentCreateView(View):
form.add_error(field, '{}: {}'.format(name, ', '.join(e)))
if not form.errors:
- self.model.objects.bulk_create(new_components)
- # ManyToMany relations are bulk created via the through model
- m2m_fields = [field for field in component_form.fields if type(component_form.fields[field]) in M2M_FIELD_TYPES]
- if m2m_fields:
- for field in m2m_fields:
- field_links = []
- for new_component in new_components:
- for related_obj in component_form.cleaned_data[field]:
- # The through model columns are the id's of our M2M relation objects
- through_kwargs = {}
- new_component_column = new_component.__class__.__name__ + '_id'
- related_obj_column = related_obj.__class__.__name__ + '_id'
- through_kwargs.update({
- new_component_column.lower(): new_component.id,
- related_obj_column.lower(): related_obj.id
- })
- field_link = getattr(self.model, field).through(**through_kwargs)
- field_links.append(field_link)
- getattr(self.model, field).through.objects.bulk_create(field_links)
+ # Create the new components
+ for component_form in new_components:
+ component_form.save()
messages.success(request, "Added {} {} to {}.".format(
len(new_components), self.model._meta.verbose_name_plural, parent
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index afbe4d0ba4..82157a481d 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -105,6 +105,7 @@ class VirtualMachineSerializer(TaggitSerializer, CustomFieldModelSerializer):
fields = [
'id', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+ 'local_context_data',
]
@@ -115,6 +116,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
fields = [
'id', 'name', 'status', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6',
'vcpus', 'memory', 'disk', 'comments', 'tags', 'custom_fields', 'config_context', 'created', 'last_updated',
+ 'local_context_data',
]
def get_config_context(self, obj):
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 7de928b4bc..4646d14da5 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -33,7 +33,7 @@ class ClusterGroupViewSet(ModelViewSet):
class ClusterViewSet(CustomFieldModelViewSet):
- queryset = Cluster.objects.select_related('type', 'group')
+ queryset = Cluster.objects.select_related('type', 'group').prefetch_related('tags')
serializer_class = serializers.ClusterSerializer
filter_class = filters.ClusterFilter
@@ -45,7 +45,7 @@ class ClusterViewSet(CustomFieldModelViewSet):
class VirtualMachineViewSet(CustomFieldModelViewSet):
queryset = VirtualMachine.objects.select_related(
'cluster__site', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6'
- )
+ ).prefetch_related('tags')
filter_class = filters.VirtualMachineFilter
def get_serializer_class(self):
@@ -58,6 +58,8 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
class InterfaceViewSet(ModelViewSet):
- queryset = Interface.objects.filter(virtual_machine__isnull=False).select_related('virtual_machine')
+ queryset = Interface.objects.filter(
+ virtual_machine__isnull=False
+ ).select_related('virtual_machine').prefetch_related('tags')
serializer_class = serializers.InterfaceSerializer
filter_class = filters.InterfaceFilter
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 6e87be5478..d228da1599 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -6,7 +6,6 @@ from taggit.forms import TagField
from dcim.constants import IFACE_FF_VIRTUAL, IFACE_MODE_ACCESS, IFACE_MODE_TAGGED_ALL
from dcim.forms import INTERFACE_MODE_HELP_TEXT
-from dcim.formfields import MACAddressFormField
from dcim.models import Device, DeviceRole, Interface, Platform, Rack, Region, Site
from extras.forms import AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldForm, CustomFieldFilterForm
from ipam.models import IPAddress
@@ -15,7 +14,8 @@ from tenancy.models import Tenant
from utilities.forms import (
AnnotatedMultipleChoiceField, APISelect, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
ChainedFieldsMixin, ChainedModelChoiceField, ChainedModelMultipleChoiceField, CommentField, ComponentForm,
- ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, SlugField, SmallTextarea, add_blank_choice
+ ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, JSONField, SlugField, SmallTextarea,
+ add_blank_choice
)
from .constants import VM_STATUS_CHOICES
from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
@@ -245,6 +245,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
)
)
tags = TagField(required=False)
+ local_context_data = JSONField(required=False)
class Meta:
model = VirtualMachine
@@ -252,6 +253,9 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
'name', 'status', 'cluster_group', 'cluster', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
'vcpus', 'memory', 'disk', 'comments', 'tags',
]
+ help_texts = {
+ 'local_context_data': "Local config context data overwrites all sources contexts in the final rendered config context",
+ }
def __init__(self, *args, **kwargs):
@@ -413,11 +417,12 @@ class VirtualMachineFilterForm(BootstrapMixin, CustomFieldFilterForm):
#
class InterfaceForm(BootstrapMixin, forms.ModelForm):
+ tags = TagField(required=False)
class Meta:
model = Interface
fields = [
- 'virtual_machine', 'name', 'form_factor', 'enabled', 'mac_address', 'mtu', 'description', 'mode',
+ 'virtual_machine', 'name', 'form_factor', 'enabled', 'mac_address', 'mtu', 'description', 'mode', 'tags',
'untagged_vlan', 'tagged_vlans',
]
widgets = {
@@ -454,8 +459,9 @@ class InterfaceCreateForm(ComponentForm):
form_factor = forms.ChoiceField(choices=VIFACE_FF_CHOICES, initial=IFACE_FF_VIRTUAL, widget=forms.HiddenInput())
enabled = forms.BooleanField(required=False)
mtu = forms.IntegerField(required=False, min_value=1, max_value=32767, label='MTU')
- mac_address = MACAddressFormField(required=False, label='MAC Address')
+ mac_address = forms.CharField(required=False, label='MAC Address')
description = forms.CharField(max_length=100, required=False)
+ tags = TagField(required=False)
def __init__(self, *args, **kwargs):
diff --git a/netbox/virtualization/migrations/0008_virtualmachine_local_context_data.py b/netbox/virtualization/migrations/0008_virtualmachine_local_context_data.py
new file mode 100644
index 0000000000..ce8105d957
--- /dev/null
+++ b/netbox/virtualization/migrations/0008_virtualmachine_local_context_data.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.8 on 2018-09-16 02:01
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('virtualization', '0007_change_logging'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='virtualmachine',
+ name='local_context_data',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+ ),
+ ]