From 5ea721a6aa37e14a4bf6e36b9ba619ec4ede7d64 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 20 Jul 2016 15:24:42 +0200 Subject: [PATCH 01/42] Fixes #166: Full DNS support --- docs/data-model/dns.md | 19 +++ docs/index.md | 1 + netbox/dns/__init__.py | 1 + netbox/dns/admin.py | 17 +++ netbox/dns/api/__init__.py | 0 netbox/dns/api/serializers.py | 38 +++++ netbox/dns/api/urls.py | 15 ++ netbox/dns/api/views.py | 44 ++++++ netbox/dns/apps.py | 6 + netbox/dns/filters.py | 36 +++++ netbox/dns/fixtures/dns.json | 37 +++++ netbox/dns/forms.py | 109 ++++++++++++++ netbox/dns/migrations/0001_initial.py | 59 ++++++++ .../dns/migrations/0002_auto_20160719_1058.py | 20 +++ netbox/dns/migrations/__init__.py | 0 netbox/dns/models.py | 83 ++++++++++ netbox/dns/tables.py | 52 +++++++ netbox/dns/tests.py | 3 + netbox/dns/urls.py | 27 ++++ netbox/dns/views.py | 140 +++++++++++++++++ netbox/ipam/api/serializers.py | 2 +- netbox/ipam/fixtures/ipam.json | 18 +++ netbox/ipam/forms.py | 6 +- .../migrations/0005_ipaddress_hostname.py | 20 +++ .../migrations/0006_auto_20160720_0941.py | 20 +++ netbox/ipam/models.py | 2 + netbox/ipam/tables.py | 3 +- netbox/ipam/views.py | 8 + netbox/netbox/settings.py | 1 + netbox/netbox/urls.py | 2 + netbox/netbox/views.py | 5 + netbox/templates/_base.html | 16 ++ netbox/templates/dns/record.html | 105 +++++++++++++ netbox/templates/dns/record_bulk_edit.html | 17 +++ netbox/templates/dns/record_import.html | 67 +++++++++ netbox/templates/dns/record_list.html | 47 ++++++ netbox/templates/dns/zone.html | 142 ++++++++++++++++++ netbox/templates/dns/zone_bulk_edit.html | 19 +++ netbox/templates/dns/zone_import.html | 82 ++++++++++ netbox/templates/dns/zone_list.html | 46 ++++++ netbox/templates/home.html | 17 +++ netbox/templates/ipam/ipaddress.html | 13 ++ .../templates/ipam/ipaddress_bulk_edit.html | 1 + netbox/templates/ipam/ipaddress_edit.html | 1 + netbox/templates/ipam/ipaddress_import.html | 7 +- 45 files changed, 1369 insertions(+), 5 deletions(-) create mode 100644 docs/data-model/dns.md create mode 100644 netbox/dns/__init__.py create mode 100644 netbox/dns/admin.py create mode 100644 netbox/dns/api/__init__.py create mode 100644 netbox/dns/api/serializers.py create mode 100644 netbox/dns/api/urls.py create mode 100644 netbox/dns/api/views.py create mode 100644 netbox/dns/apps.py create mode 100644 netbox/dns/filters.py create mode 100644 netbox/dns/fixtures/dns.json create mode 100644 netbox/dns/forms.py create mode 100644 netbox/dns/migrations/0001_initial.py create mode 100644 netbox/dns/migrations/0002_auto_20160719_1058.py create mode 100644 netbox/dns/migrations/__init__.py create mode 100644 netbox/dns/models.py create mode 100644 netbox/dns/tables.py create mode 100644 netbox/dns/tests.py create mode 100644 netbox/dns/urls.py create mode 100644 netbox/dns/views.py create mode 100644 netbox/ipam/migrations/0005_ipaddress_hostname.py create mode 100644 netbox/ipam/migrations/0006_auto_20160720_0941.py create mode 100644 netbox/templates/dns/record.html create mode 100644 netbox/templates/dns/record_bulk_edit.html create mode 100644 netbox/templates/dns/record_import.html create mode 100644 netbox/templates/dns/record_list.html create mode 100644 netbox/templates/dns/zone.html create mode 100644 netbox/templates/dns/zone_bulk_edit.html create mode 100644 netbox/templates/dns/zone_import.html create mode 100644 netbox/templates/dns/zone_list.html diff --git a/docs/data-model/dns.md b/docs/data-model/dns.md new file mode 100644 index 00000000000..3951e9c41a6 --- /dev/null +++ b/docs/data-model/dns.md @@ -0,0 +1,19 @@ +The DNS component of NetBox deals with the management of DNS zones. + +# Zones + +A zone corresponds to a zone file in a DNS server, it stores the SOA (Start Of Authority) record and other records that are stored as Record objects. + +As zones are readable through the REST API, it is possible to write some external script which automatically generates zone files for a DNS server, +this feature is not directly provided by NetBox though. + +--- + +# Record + +Each Record object represents a DNS record, i.e. a link between a hostname and a resource, which can be either an IP address or a text value, +for instance another hostname if the record is of CNAME type. + +Records must be linked to an existing zone, and hold either an existing IP address link or a text value. + +Reverse DNS is not supported by Record objects, but by the "Host Name" field in IP addresses. diff --git a/docs/index.md b/docs/index.md index e9f57253df3..c1bd12e95eb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -3,6 +3,7 @@ NetBox is an open source web application designed to help manage and document computer networks. Initially conceived by the network engineering team at [DigitalOcean](https://www.digitalocean.com/), NetBox was developed specifically to address the needs of network and infrastructure engineers. It encompasses the following aspects of network management: * **IP address management (IPAM)** - IP networks and addresses, VRFs, and VLANs +* **DNS management** - DNS zones and records * **Equipment racks** - Organized by group and site * **Devices** - Types of devices and where they are installed * **Connections** - Network, console, and power connections among devices diff --git a/netbox/dns/__init__.py b/netbox/dns/__init__.py new file mode 100644 index 00000000000..b6efa77a11f --- /dev/null +++ b/netbox/dns/__init__.py @@ -0,0 +1 @@ +default_app_config = 'dns.apps.DNSConfig' diff --git a/netbox/dns/admin.py b/netbox/dns/admin.py new file mode 100644 index 00000000000..d5956c62472 --- /dev/null +++ b/netbox/dns/admin.py @@ -0,0 +1,17 @@ +from django.contrib import admin + +from .models import ( + Zone, Record, +) + + +@admin.register(Zone) +class ZoneAdmin(admin.ModelAdmin): + list_display = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial'] + prepopulated_fields = { + 'soa_name': ['name'], + } + +@admin.register(Record) +class RecordAdmin(admin.ModelAdmin): + list_display = ['name', 'zone', 'record_type', 'priority', 'address', 'value'] diff --git a/netbox/dns/api/__init__.py b/netbox/dns/api/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/netbox/dns/api/serializers.py b/netbox/dns/api/serializers.py new file mode 100644 index 00000000000..f62285bd65b --- /dev/null +++ b/netbox/dns/api/serializers.py @@ -0,0 +1,38 @@ +from rest_framework import serializers + +from ipam.api.serializers import IPAddressNestedSerializer +from dns.models import Zone, Record + +# +# Zones +# + +class ZoneSerializer(serializers.ModelSerializer): + + class Meta: + model=Zone + fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + +class ZoneNestedSerializer(ZoneSerializer): + + class Meta(ZoneSerializer.Meta): + fields = ['id', 'name'] + + +# +# Records +# + +class RecordSerializer(serializers.ModelSerializer): + + zone = ZoneNestedSerializer() + address = IPAddressNestedSerializer() + + class Meta: + model=Record + fields = ['id', 'name', 'record_type', 'priority', 'zone', 'address', 'value'] + +class RecordNestedSerializer(RecordSerializer): + + class Meta(RecordSerializer.Meta): + fields = ['id', 'name', 'record_type', 'zone'] \ No newline at end of file diff --git a/netbox/dns/api/urls.py b/netbox/dns/api/urls.py new file mode 100644 index 00000000000..2d6c622a3cc --- /dev/null +++ b/netbox/dns/api/urls.py @@ -0,0 +1,15 @@ +from django.conf.urls import url + +from .views import * + +urlpatterns = [ + + # Zones + url(r'^zones/$', ZoneListView.as_view(), name='zone_list'), + url(r'^zones/(?P\d+)/$', ZoneDetailView.as_view(), name='zone_detail'), + + # Records + url(r'^records/$', RecordListView.as_view(), name='record_list'), + url(r'^records/(?P\d+)/$', RecordDetailView.as_view(), name='record_detail'), + +] diff --git a/netbox/dns/api/views.py b/netbox/dns/api/views.py new file mode 100644 index 00000000000..8b304694e68 --- /dev/null +++ b/netbox/dns/api/views.py @@ -0,0 +1,44 @@ +from rest_framework import generics + +from ipam.models import IPAddress +from dns.models import Zone, Record +from dns import filters + +from . import serializers + +# +# Zones +# + +class ZoneListView(generics.ListAPIView): + """ + List all zones + """ + queryset = Zone.objects.all() + serializer_class = serializers.ZoneSerializer + filter_class = filters.ZoneFilter + +class ZoneDetailView(generics.RetrieveAPIView): + """ + Retrieve a single zone + """ + queryset = Zone.objects.all() + serializer_class = serializers.ZoneSerializer + +# +# Records +# + +class RecordListView(generics.ListAPIView): + """ + List all records + """ + queryset = Record.objects.all() + serializer_class = serializers.RecordSerializer + +class RecordDetailView(generics.RetrieveAPIView): + """ + Retrieve a single record + """ + queryset = Record.objects.all() + serializer_class = serializers.RecordSerializer diff --git a/netbox/dns/apps.py b/netbox/dns/apps.py new file mode 100644 index 00000000000..a8e0badcb88 --- /dev/null +++ b/netbox/dns/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class DNSConfig(AppConfig): + name = 'dns' + verbose_name='DNS' diff --git a/netbox/dns/filters.py b/netbox/dns/filters.py new file mode 100644 index 00000000000..dcf38b6b325 --- /dev/null +++ b/netbox/dns/filters.py @@ -0,0 +1,36 @@ +import django_filters + +from ipam.models import IPAddress +from .models import ( + Zone, + Record, +) + +class ZoneFilter(django_filters.FilterSet): + name = django_filters.CharFilter( + name='name', + lookup_type='icontains', + label='Name', + ) + + class Meta: + model = Zone + fields = ['name'] + +class RecordFilter(django_filters.FilterSet): + zone__name = django_filters.ModelMultipleChoiceFilter( + name='zone__name', + to_field_name='name', + lookup_type='icontains', + queryset=Zone.objects.all(), + label='Zone (name)', + ) + name = django_filters.CharFilter( + name='name', + lookup_type='icontains', + label='Name', + ) + + class Meta: + model=Record + field = ['name','record_type','value'] diff --git a/netbox/dns/fixtures/dns.json b/netbox/dns/fixtures/dns.json new file mode 100644 index 00000000000..a093b51e38e --- /dev/null +++ b/netbox/dns/fixtures/dns.json @@ -0,0 +1,37 @@ +[ +{ + "model": "dns.zone", + "pk": 1, + "fields": { + "name": "foo.net", + "ttl": 10800, + "soa_name": "@", + "soa_contact": "ns@foo.net. noc@foo.net.", + "soa_serial": "2016070401", + "soa_refresh": 3600, + "soa_retry": 3600, + "soa_expire": 604800, + "soa_minimum": 1800 + } +}, +{ + "model": "dns.record", + "pk": 1, + "fields": { + "name": "@", + "record_type": "NS", + "zone": 1, + "value": "ns.foo.net." + } +}, +{ + "model": "dns.record", + "pk": 2, + "fields": { + "name": "www", + "record_type": "A", + "zone": 1, + "address": 1 + } +} +] \ No newline at end of file diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py new file mode 100644 index 00000000000..2b2ded7c972 --- /dev/null +++ b/netbox/dns/forms.py @@ -0,0 +1,109 @@ +from django import forms +from django.db.models import Count + +from ipam.models import IPAddress +from utilities.forms import ( + BootstrapMixin, ConfirmationForm, APISelect, Livesearch, CSVDataField, BulkImportForm, +) + +from .models import ( + Zone, + Record, +) + +# +# Zones +# + +class ZoneForm(forms.ModelForm, BootstrapMixin): + + class Meta: + model=Zone + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + labels = { + 'soa_name': 'SOA Name', + 'soa_contact': 'SOA Contact', + 'soa_serial': 'SOA Serial', + 'soa_refresh': 'SOA Refresh', + 'soa_retry': 'SOA Retry', + 'soa_expire': 'SOA Expire', + 'soa_minimum': 'SOA Minimum', + } + +class ZoneFromCSVForm(forms.ModelForm): + + class Meta: + model=Zone + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + +class ZoneImportForm(BulkImportForm, BootstrapMixin): + csv = CSVDataField(csv_form=ZoneFromCSVForm) + +class ZoneBulkEditForm(forms.Form, BootstrapMixin): + pk = forms.ModelMultipleChoiceField(queryset=Zone.objects.all(), widget=forms.MultipleHiddenInput) + name = forms.CharField(max_length=100, required=False, label='Name') + ttl = forms.IntegerField(required=False, label='TTL') + soa_name = forms.CharField(max_length=100, required=False, label='SOA Name') + soa_contact = forms.CharField(max_length=100, required=False, label='SOA Contact') + soa_refresh = forms.IntegerField(required=False, label='SOA Refresh') + soa_retry = forms.IntegerField(required=False, label='SOA Retry') + soa_expire = forms.IntegerField(required=False, label='SOA Expire') + soa_minimum = forms.IntegerField(required=False, label='SOA Minimum') + + +class ZoneBulkDeleteForm(ConfirmationForm): + pk = forms.ModelMultipleChoiceField(queryset=Zone.objects.all(), widget=forms.MultipleHiddenInput) + +class ZoneFilterForm(forms.Form, BootstrapMixin): + pass + +# +# Records +# + +class RecordForm(forms.ModelForm, BootstrapMixin): + + class Meta: + model=Record + fields = ['name', 'record_type', 'priority', 'zone', 'address', 'value'] + labels = { + 'record_type': 'Type', + } + +class RecordFromCSVForm(forms.ModelForm): + + zone = forms.ModelChoiceField(queryset=Zone.objects.all(), to_field_name='name', error_messages={'invalid_choice': 'Zone not found.'}) + address = forms.ModelChoiceField(queryset=IPAddress.objects.all(), to_field_name='address', error_messages={'invalid_choice': 'IP Address not found.'}, required=False) + + class Meta: + model=Record + fields = ['zone', 'name', 'record_type', 'priority', 'address', 'value'] + +class RecordImportForm(BulkImportForm, BootstrapMixin): + csv = CSVDataField(csv_form=RecordFromCSVForm) + +class RecordBulkEditForm(forms.Form, BootstrapMixin): + pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) + name = forms.CharField(max_length=100, required=False, label='Name') + record_type = forms.CharField(max_length=100, required=False, label='Type') + priority = forms.IntegerField(required=False) + zone = forms.ModelChoiceField(queryset=Zone.objects.all(), required=False) + address = forms.ModelChoiceField(queryset=IPAddress.objects.all(), required=False) + value = forms.CharField(max_length=100, required=False) + +class RecordBulkDeleteForm(ConfirmationForm): + pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) + +def record_zone_choices(): + zone_choices = Zone.objects.annotate(record_count=Count('records')) + return [(z.name, '{} ({})'.format(z.name, z.record_count)) for z in zone_choices] + +#def record_name_choices(): + #name_choices = + +class RecordFilterForm(forms.Form, BootstrapMixin): + zone__name = forms.MultipleChoiceField(required=False, choices=record_zone_choices, label='Zone', + widget=forms.SelectMultiple(attrs={'size': 8})) + #name = forms.MultipleChoiceField(required=False, choices=record_name_choices, label='Name', widget=forms.SelectMultiple(attrs={'size': 8})) + record_type = forms.CharField(max_length=100, required=False, label='Type') + diff --git a/netbox/dns/migrations/0001_initial.py b/netbox/dns/migrations/0001_initial.py new file mode 100644 index 00000000000..c32618198c2 --- /dev/null +++ b/netbox/dns/migrations/0001_initial.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-19 10:44 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('ipam', '0004_ipam_vlangroup_uniqueness'), + ] + + operations = [ + migrations.CreateModel( + name='Record', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateField(auto_now_add=True)), + ('last_updated', models.DateTimeField(auto_now=True)), + ('name', models.CharField(max_length=100)), + ('record_type', models.CharField(max_length=10)), + ('priority', models.PositiveIntegerField(blank=True)), + ('value', models.CharField(blank=True, max_length=100)), + ('address', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='records', to='ipam.IPAddress')), + ], + options={ + 'ordering': ['name'], + }, + ), + migrations.CreateModel( + name='Zone', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateField(auto_now_add=True)), + ('last_updated', models.DateTimeField(auto_now=True)), + ('name', models.CharField(max_length=100)), + ('ttl', models.PositiveIntegerField()), + ('soa_name', models.CharField(max_length=100)), + ('soa_contact', models.CharField(max_length=100)), + ('soa_serial', models.CharField(max_length=100)), + ('soa_refresh', models.PositiveIntegerField()), + ('soa_retry', models.PositiveIntegerField()), + ('soa_expire', models.PositiveIntegerField()), + ('soa_minimum', models.PositiveIntegerField()), + ], + options={ + 'ordering': ['name'], + }, + ), + migrations.AddField( + model_name='record', + name='zone', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='records', to='dns.Zone'), + ), + ] diff --git a/netbox/dns/migrations/0002_auto_20160719_1058.py b/netbox/dns/migrations/0002_auto_20160719_1058.py new file mode 100644 index 00000000000..4d6118ff215 --- /dev/null +++ b/netbox/dns/migrations/0002_auto_20160719_1058.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-19 10:58 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dns', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='record', + name='priority', + field=models.PositiveIntegerField(blank=True, null=True), + ), + ] diff --git a/netbox/dns/migrations/__init__.py b/netbox/dns/migrations/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/netbox/dns/models.py b/netbox/dns/models.py new file mode 100644 index 00000000000..5e2528ee97c --- /dev/null +++ b/netbox/dns/models.py @@ -0,0 +1,83 @@ + +from django.conf import settings +from django.core.exceptions import ValidationError +from django.core.urlresolvers import reverse +from django.db import models + +from ipam.models import IPAddress +from utilities.models import CreatedUpdatedModel + +class Zone(CreatedUpdatedModel): + """ + A Zone represents a DNS zone. It contains SOA data but no records, records are represented as Record objects. + """ + name=models.CharField(max_length=100) + ttl=models.PositiveIntegerField() + soa_name=models.CharField(max_length=100) + soa_contact=models.CharField(max_length=100) + soa_serial=models.CharField(max_length=100) + soa_refresh=models.PositiveIntegerField() + soa_retry=models.PositiveIntegerField() + soa_expire=models.PositiveIntegerField() + soa_minimum=models.PositiveIntegerField() + + class Meta: + ordering = ['name'] + + def __unicode__(self): + return self.name + + def get_absolute_url(self): + return reverse('dns:zone', args=[self.pk]) + + def to_csv(self): + return ','.join([ + self.name, + str(self.ttl), + self.soa_name, + self.soa_contact, + self.soa_serial, + str(self.soa_refresh), + str(self.soa_retry), + str(self.soa_expire), + str(self.soa_minimum), + ]) + + + +class Record(CreatedUpdatedModel): + """ + A Record represents a DNS record, i.e. a row in a DNS zone. + """ + name=models.CharField(max_length=100) + record_type=models.CharField(max_length=10) + priority=models.PositiveIntegerField(blank=True, null=True) + zone=models.ForeignKey('Zone', related_name='records', on_delete=models.CASCADE) + address=models.ForeignKey('ipam.IPAddress', related_name='records', on_delete=models.SET_NULL, blank=True, null=True) + value=models.CharField(max_length=100, blank=True) + + class Meta: + ordering = ['name'] + + def __unicode__(self): + return self.name + + def get_absolute_url(self): + return reverse('dns:record', args=[self.pk]) + + def clean(self): + if not self.address and not self.value: + raise ValidationError("DNS records must have either an IP address or a text value") + + def to_csv(self): + return ','.join([ + self.zone.name, + self.name, + self.record_type, + str(self.priority) if self.priority else '', + str(self.address) if self.address else '', + str(self.value) if self.value else '', + ]) + + #def to_json(self): + # return JSON diff --git a/netbox/dns/tables.py b/netbox/dns/tables.py new file mode 100644 index 00000000000..8d01775845a --- /dev/null +++ b/netbox/dns/tables.py @@ -0,0 +1,52 @@ +import django_tables2 as tables +from django_tables2.utils import Accessor + +from utilities.tables import BaseTable, ToggleColumn + +from ipam.models import IPAddress +from .models import Zone, Record + +# +# Zones +# + +class ZoneTable(BaseTable): + pk = ToggleColumn() + name = tables.LinkColumn('dns:zone', args=[Accessor('pk')], verbose_name='Name') + record_count = tables.Column(verbose_name='Records') + ttl = tables.Column(verbose_name='TTL') + soa_name = tables.Column(verbose_name='SOA Name') + soa_contact = tables.Column(verbose_name='SOA Contact') + soa_serial = tables.Column(verbose_name='SOA Serial') + + class Meta(BaseTable.Meta): + model = Zone + fields = ('pk', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial') + +# +# Records +# + +class RecordTable(BaseTable): + pk = ToggleColumn() + name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + record_type = tables.Column(verbose_name='Type') + priority = tables.Column(verbose_name='Priority') + address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') + value = tables.Column(verbose_name='Text Value') + zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') + + class Meta(BaseTable.Meta): + model=Record + fields = ('pk', 'name', 'record_type', 'priority', 'address', 'value') + +class RecordBriefTable(BaseTable): + name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + record_type = tables.Column(verbose_name='Type') + priority = tables.Column(verbose_name='Priority') + zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') + + class Meta(BaseTable.Meta): + model=Record + fields = ('name', 'record_type', 'priority', 'zone') + \ No newline at end of file diff --git a/netbox/dns/tests.py b/netbox/dns/tests.py new file mode 100644 index 00000000000..7ce503c2dd9 --- /dev/null +++ b/netbox/dns/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/netbox/dns/urls.py b/netbox/dns/urls.py new file mode 100644 index 00000000000..633cbe99189 --- /dev/null +++ b/netbox/dns/urls.py @@ -0,0 +1,27 @@ +from django.conf.urls import url + +from . import views + +urlpatterns = [ + + # Zones + url(r'^zones/$', views.ZoneListView.as_view(), name='zone_list'), + url(r'^zones/add/$', views.ZoneEditView.as_view(), name='zone_add'), + url(r'^zones/import/$', views.ZoneBulkImportView.as_view(), name='zone_import'), + url(r'^zones/edit/$', views.ZoneBulkEditView.as_view(), name='zone_bulk_edit'), + url(r'^zones/delete/$', views.ZoneBulkDeleteView.as_view(), name='zone_bulk_delete'), + url(r'^zones/(?P\d+)/$', views.zone, name='zone'), + url(r'^zones/(?P\d+)/edit/$', views.ZoneEditView.as_view(), name='zone_edit'), + url(r'^zones/(?P\d+)/delete/$', views.ZoneDeleteView.as_view(), name='zone_delete'), + + # Records + url(r'^records/$', views.RecordListView.as_view(), name='record_list'), + url(r'^records/add/$', views.RecordEditView.as_view(), name='record_add'), + url(r'^records/import/$', views.RecordBulkImportView.as_view(), name='record_import'), + url(r'^records/edit/$', views.RecordBulkEditView.as_view(), name='record_bulk_edit'), + url(r'^records/delete/$', views.RecordBulkDeleteView.as_view(), name='record_bulk_delete'), + url(r'^records/(?P\d+)/$', views.record, name='record'), + url(r'^records/(?P\d+)/edit/$', views.RecordEditView.as_view(), name='record_edit'), + url(r'^records/(?P\d+)/delete/$', views.RecordDeleteView.as_view(), name='record_delete'), + +] diff --git a/netbox/dns/views.py b/netbox/dns/views.py new file mode 100644 index 00000000000..da914fb2939 --- /dev/null +++ b/netbox/dns/views.py @@ -0,0 +1,140 @@ +from django_tables2 import RequestConfig + +from django.contrib.auth.mixins import PermissionRequiredMixin +from django.db.models import Count +from django.shortcuts import get_object_or_404, render + +from ipam.models import IPAddress +from utilities.paginator import EnhancedPaginator +from utilities.views import ( + BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView, +) + +from . import filters, forms, tables +from .models import Zone, Record + +# +# Zones +# + +class ZoneListView(ObjectListView): + queryset = Zone.objects.annotate(record_count=Count('records')) + filter = filters.ZoneFilter + filter_form = forms.ZoneFilterForm + table = tables.ZoneTable + edit_permissions = ['dns.change_zone', 'dns.delete_zone'] + template_name = 'dns/zone_list.html' + +def zone(request, pk): + + zone = get_object_or_404(Zone.objects.all(), pk=pk) + records = Record.objects.filter(zone=zone) + record_count = len(records) + + return render(request, 'dns/zone.html', { + 'zone': zone, + 'records': records, + 'record_count': record_count, + }) + +class ZoneEditView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dns.change_zone' + model = Zone + form_class = forms.ZoneForm + cancel_url = 'dns:zone_list' + +class ZoneDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dns.delete_zone' + model = Zone + redirect_url = 'dns:zone_list' + + +class ZoneBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dns.add_zone' + form = forms.ZoneImportForm + table = tables.ZoneTable + template_name = 'dns/zone_import.html' + obj_list_url = 'dns:zone_list' + +class ZoneBulkEditView(PermissionRequiredMixin, BulkEditView): + permission_required = 'dns.change_zone' + cls = Zone + form = forms.ZoneBulkEditForm + template_name = 'dns/zone_bulk_edit.html' + default_redirect_url = 'dns:zone_list' + + def update_objects(self, pk_list, form): + + fields_to_update = {} + for field in ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum']: + if form.cleaned_data[field]: + fields_to_update[field] = form.cleaned_data[field] + + return self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update) + + +class ZoneBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dns.delete_zone' + cls = Zone + form = forms.ZoneBulkDeleteForm + default_redirect_url = 'dns:zone_list' + +# +# Records +# + +class RecordListView(ObjectListView): + queryset = Record.objects.all() + filter = filters.RecordFilter + filter_form = forms.RecordFilterForm + table = tables.RecordTable + edit_permissions = ['dns.change_record', 'dns.delete_record'] + template_name = 'dns/record_list.html' + +def record(request, pk): + + record = get_object_or_404(Record.objects.all(), pk=pk) + + return render(request, 'dns/record.html', { + 'record': record, + }) + +class RecordEditView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dns.change_record' + model = Record + form_class = forms.RecordForm + cancel_url = 'dns:record_list' + +class RecordDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dns.delete_record' + model = Record + redirect_url = 'dns:record_list' + +class RecordBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dns.add_record' + form = forms.RecordImportForm + table = tables.RecordTable + template_name = 'dns/record_import.html' + obj_list_url = 'dns:record_list' + +class RecordBulkEditView(PermissionRequiredMixin, BulkEditView): + permission_required = 'dns.change_record' + cls = Record + form = forms.RecordBulkEditForm + template_name = 'dns/record_bulk_edit.html' + default_redirect_url = 'dns:record_list' + + def update_objects(self, pk_list, form): + + fields_to_update = {} + for field in ['name', 'record_type', 'priority', 'zone', 'address', 'value']: + if form.cleaned_data[field]: + fields_to_update[field] = form.cleaned_data[field] + + return self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update) + +class RecordBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dns.delete_record' + cls = Record + form = forms.RecordBulkEditForm + default_redirect_url = 'dns:record_list' diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index c3d442fdf9b..bd7754c1d3f 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -142,7 +142,7 @@ class IPAddressSerializer(serializers.ModelSerializer): class Meta: model = IPAddress - fields = ['id', 'family', 'address', 'vrf', 'interface', 'description', 'nat_inside', 'nat_outside'] + fields = ['id', 'family', 'address', 'vrf', 'hostname', 'interface', 'description', 'nat_inside', 'nat_outside'] class IPAddressNestedSerializer(IPAddressSerializer): diff --git a/netbox/ipam/fixtures/ipam.json b/netbox/ipam/fixtures/ipam.json index 1a981a941e1..6a3190a3b31 100644 --- a/netbox/ipam/fixtures/ipam.json +++ b/netbox/ipam/fixtures/ipam.json @@ -70,6 +70,7 @@ "family": 4, "address": "10.0.255.1/32", "vrf": null, + "hostname": "foo.net", "interface": 3, "nat_inside": null, "description": "" @@ -84,6 +85,7 @@ "family": 4, "address": "169.254.254.1/31", "vrf": null, + "hostname": "", "interface": 4, "nat_inside": null, "description": "" @@ -98,6 +100,7 @@ "family": 4, "address": "10.0.255.2/32", "vrf": null, + "hostname": "", "interface": 185, "nat_inside": null, "description": "" @@ -112,6 +115,7 @@ "family": 4, "address": "169.254.1.1/31", "vrf": null, + "hostname": "", "interface": 213, "nat_inside": null, "description": "" @@ -126,6 +130,7 @@ "family": 4, "address": "10.0.254.1/24", "vrf": null, + "hostname": "", "interface": 12, "nat_inside": null, "description": "" @@ -140,6 +145,7 @@ "family": 4, "address": "10.15.21.1/31", "vrf": null, + "hostname": "", "interface": 218, "nat_inside": null, "description": "" @@ -154,6 +160,7 @@ "family": 4, "address": "10.15.21.2/31", "vrf": null, + "hostname": "", "interface": 9, "nat_inside": null, "description": "" @@ -168,6 +175,7 @@ "family": 4, "address": "10.15.22.1/31", "vrf": null, + "hostname": "", "interface": 8, "nat_inside": null, "description": "" @@ -182,6 +190,7 @@ "family": 4, "address": "10.15.20.1/31", "vrf": null, + "hostname": "", "interface": 7, "nat_inside": null, "description": "" @@ -196,6 +205,7 @@ "family": 4, "address": "10.16.20.1/31", "vrf": null, + "hostname": "", "interface": 216, "nat_inside": null, "description": "" @@ -210,6 +220,7 @@ "family": 4, "address": "10.15.22.2/31", "vrf": null, + "hostname": "", "interface": 206, "nat_inside": null, "description": "" @@ -224,6 +235,7 @@ "family": 4, "address": "10.16.22.1/31", "vrf": null, + "hostname": "", "interface": 217, "nat_inside": null, "description": "" @@ -238,6 +250,7 @@ "family": 4, "address": "10.16.22.2/31", "vrf": null, + "hostname": "", "interface": 205, "nat_inside": null, "description": "" @@ -252,6 +265,7 @@ "family": 4, "address": "10.16.20.2/31", "vrf": null, + "hostname": "", "interface": 211, "nat_inside": null, "description": "" @@ -266,6 +280,7 @@ "family": 4, "address": "10.15.22.2/31", "vrf": null, + "hostname": "", "interface": 212, "nat_inside": null, "description": "" @@ -280,6 +295,7 @@ "family": 4, "address": "10.0.254.2/32", "vrf": null, + "hostname": "", "interface": 188, "nat_inside": null, "description": "" @@ -294,6 +310,7 @@ "family": 4, "address": "169.254.1.1/31", "vrf": null, + "hostname": "", "interface": 200, "nat_inside": null, "description": "" @@ -308,6 +325,7 @@ "family": 4, "address": "169.254.1.2/31", "vrf": null, + "hostname": "", "interface": 194, "nat_inside": null, "description": "" diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 5c0c7805f28..b39dd0175a0 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -311,10 +311,11 @@ class IPAddressForm(forms.ModelForm, BootstrapMixin): class Meta: model = IPAddress - fields = ['address', 'vrf', 'nat_device', 'nat_inside', 'description'] + fields = ['address', 'vrf', 'hostname', 'nat_device', 'nat_inside', 'description'] help_texts = { 'address': "IPv4 or IPv6 address and mask", 'vrf': "VRF (if applicable)", + 'hostname': "Reverse DNS host name", } def __init__(self, *args, **kwargs): @@ -367,7 +368,7 @@ class IPAddressFromCSVForm(forms.ModelForm): class Meta: model = IPAddress - fields = ['address', 'vrf', 'device', 'interface_name', 'is_primary', 'description'] + fields = ['address', 'vrf', 'hostname', 'device', 'interface_name', 'is_primary', 'description'] def clean(self): @@ -414,6 +415,7 @@ class IPAddressBulkEditForm(forms.Form, BootstrapMixin): pk = forms.ModelMultipleChoiceField(queryset=IPAddress.objects.all(), widget=forms.MultipleHiddenInput) vrf = forms.ModelChoiceField(queryset=VRF.objects.all(), required=False, label='VRF', help_text="Select the VRF to assign, or check below to remove VRF assignment") + hostname = forms.CharField(max_length=100, required=False) vrf_global = forms.BooleanField(required=False, label='Set VRF to global') description = forms.CharField(max_length=50, required=False) diff --git a/netbox/ipam/migrations/0005_ipaddress_hostname.py b/netbox/ipam/migrations/0005_ipaddress_hostname.py new file mode 100644 index 00000000000..8f771d9dc9c --- /dev/null +++ b/netbox/ipam/migrations/0005_ipaddress_hostname.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-19 15:37 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0004_ipam_vlangroup_uniqueness'), + ] + + operations = [ + migrations.AddField( + model_name='ipaddress', + name='hostname', + field=models.CharField(blank=True, max_length=100), + ), + ] diff --git a/netbox/ipam/migrations/0006_auto_20160720_0941.py b/netbox/ipam/migrations/0006_auto_20160720_0941.py new file mode 100644 index 00000000000..4b22af0b5fc --- /dev/null +++ b/netbox/ipam/migrations/0006_auto_20160720_0941.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-20 09:41 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0005_ipaddress_hostname'), + ] + + operations = [ + migrations.AlterField( + model_name='ipaddress', + name='hostname', + field=models.CharField(blank=True, max_length=100, verbose_name=b'Host Name'), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 0aa971ae3b2..87ebfb70579 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -304,6 +304,7 @@ class IPAddress(CreatedUpdatedModel): address = IPAddressField() vrf = models.ForeignKey('VRF', related_name='ip_addresses', on_delete=models.PROTECT, blank=True, null=True, verbose_name='VRF') + hostname = models.CharField(max_length=100, blank=True, verbose_name='Host Name') interface = models.ForeignKey(Interface, related_name='ip_addresses', on_delete=models.CASCADE, blank=True, null=True) nat_inside = models.OneToOneField('self', related_name='nat_outside', on_delete=models.SET_NULL, blank=True, @@ -354,6 +355,7 @@ def to_csv(self): return ','.join([ str(self.address), self.vrf.rd if self.vrf else '', + self.hostname if self.hostname else '', self.device.identifier if self.device else '', self.interface.name if self.interface else '', 'True' if is_primary else '', diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index f3090625553..83d062ec98b 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -160,6 +160,7 @@ class IPAddressTable(BaseTable): pk = ToggleColumn() address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('pk')], verbose_name='IP Address') vrf = tables.Column(orderable=False, default='Global', verbose_name='VRF') + hostname = tables.Column(verbose_name='Host Name') device = tables.LinkColumn('dcim:device', args=[Accessor('interface.device.pk')], orderable=False, verbose_name='Device') interface = tables.Column(orderable=False, verbose_name='Interface') @@ -167,7 +168,7 @@ class IPAddressTable(BaseTable): class Meta(BaseTable.Meta): model = IPAddress - fields = ('pk', 'address', 'vrf', 'device', 'interface', 'description') + fields = ('pk', 'address', 'vrf', 'hostname', 'device', 'interface', 'description') class IPAddressBriefTable(BaseTable): diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index ea980c2c6db..5496d2c4af4 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -6,6 +6,8 @@ from django.shortcuts import get_object_or_404, render from dcim.models import Device +from dns.models import Zone, Record +from dns.tables import RecordBriefTable from utilities.paginator import EnhancedPaginator from utilities.views import ( BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView, @@ -409,11 +411,17 @@ def ipaddress(request, pk): .filter(vrf=ipaddress.vrf, address__net_contained_or_equal=str(ipaddress.address)) related_ips_table = tables.IPAddressBriefTable(related_ips) + # Related DNS records + dns_records = Record.objects.filter(address=ipaddress) + dns_records_table = RecordBriefTable(dns_records) + + return render(request, 'ipam/ipaddress.html', { 'ipaddress': ipaddress, 'parent_prefixes_table': parent_prefixes_table, 'duplicate_ips_table': duplicate_ips_table, 'related_ips_table': related_ips_table, + 'dns_records_table': dns_records_table, }) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 01f26619488..cfd7c12f3b1 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -106,6 +106,7 @@ 'circuits', 'dcim', 'ipam', + 'dns', 'extras', 'secrets', 'users', diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index 3a9d6b00a21..b6a15ac0461 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -21,6 +21,7 @@ url(r'^circuits/', include('circuits.urls', namespace='circuits')), url(r'^dcim/', include('dcim.urls', namespace='dcim')), url(r'^ipam/', include('ipam.urls', namespace='ipam')), + url(r'^dns/', include('dns.urls', namespace='dns')), url(r'^secrets/', include('secrets.urls', namespace='secrets')), url(r'^profile/', include('users.urls', namespace='users')), @@ -28,6 +29,7 @@ url(r'^api/circuits/', include('circuits.api.urls', namespace='circuits-api')), url(r'^api/dcim/', include('dcim.api.urls', namespace='dcim-api')), url(r'^api/ipam/', include('ipam.api.urls', namespace='ipam-api')), + url(r'^api/dns/', include('dns.api.urls', namespace='dns-api')), url(r'^api/secrets/', include('secrets.api.urls', namespace='secrets-api')), url(r'^api/docs/', include('rest_framework_swagger.urls')), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 9fda7f92c55..a1a177a18a4 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -6,6 +6,7 @@ from dcim.models import Site, Rack, Device, ConsolePort, PowerPort, InterfaceConnection from extras.models import UserAction from ipam.models import Aggregate, Prefix, IPAddress, VLAN +from dns.models import Zone, Record from secrets.models import Secret @@ -27,6 +28,10 @@ def home(request): 'ipaddress_count': IPAddress.objects.count(), 'vlan_count': VLAN.objects.count(), + # DNS + 'zone_count': Zone.objects.count(), + 'record_count': Record.objects.count(), + # Circuits 'provider_count': Provider.objects.count(), 'circuit_count': Circuit.objects.count(), diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html index fedbd43bffb..313843f0f4c 100644 --- a/netbox/templates/_base.html +++ b/netbox/templates/_base.html @@ -156,6 +156,22 @@ {% endif %} +
  • + + +
    • diff --git a/netbox/templates/dns/record.html b/netbox/templates/dns/record.html new file mode 100644 index 00000000000..1dbf25d3025 --- /dev/null +++ b/netbox/templates/dns/record.html @@ -0,0 +1,105 @@ +{% extends '_base.html' %} +{% load render_table from django_tables2 %} + +{% block title %}Record {{ record }}{% endblock %} + +{% block content %} +
      +
      +
        +
      1. Zones
        2. +
      2. {{ record.zone }}
        3. +
      3. Records
        4. +
      4. {{ record }}
        5. +
      +
      +
      +
      +
      + + + + +
      +
      +
      +
      +
      + {% if perms.dns.change_record %} + + + Edit this record + + {% endif %} + {% if perms.dns.delete_record %} + + + Delete this record + + {% endif %} +
      +

      {{ record }}

      +
      +
      +
      +
      + Record +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Zone{{ record.zone }}
      Name{{ record.name }}
      Type{{ record.record_type }}
      Priority + {% if record.priority %} + {{ record.priority }} + {% else %} + - + {% endif %} +
      IP Address + {% if record.address %} + {{ record.address }} + {% else %} + - + {% endif %} +
      Value + {% if record.value %} + {{ record.value }} + {% else %} + - + {% endif %} +
      Created{{ record.created }}
      Last Updated{{ record.last_updated }}
      +
      +
      +
      +{% endblock %} diff --git a/netbox/templates/dns/record_bulk_edit.html b/netbox/templates/dns/record_bulk_edit.html new file mode 100644 index 00000000000..d9764cfa110 --- /dev/null +++ b/netbox/templates/dns/record_bulk_edit.html @@ -0,0 +1,17 @@ +{% extends 'utilities/bulk_edit_form.html' %} +{% load form_helpers %} + +{% block title %}Record Bulk Edit{% endblock %} + +{% block select_objects_table %} + {% for record in selected_objects %} + + {{ record.name }} + {{ record.record_type }} + {{ record.priority }} + {{ record.address }} + {{ record.value }} + {{ record.zone }} + + {% endfor %} +{% endblock %} diff --git a/netbox/templates/dns/record_import.html b/netbox/templates/dns/record_import.html new file mode 100644 index 00000000000..bb39e3e4f04 --- /dev/null +++ b/netbox/templates/dns/record_import.html @@ -0,0 +1,67 @@ +{% extends '_base.html' %} +{% load render_table from django_tables2 %} +{% load form_helpers %} + +{% block title %}Record Import{% endblock %} + +{% block content %} +

      Record Import

      +
      +
      +
      + {% csrf_token %} + {% render_form form %} +
      + + Cancel +
      +
      +
      +
      +

      CSV Format

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      FieldDescriptionExample
      Zone nameName of zonefoo.net
      NameName of record, @ for originwww
      TypeType of recordAAAA
      PriorityPriority level of record (optional)30
      AddressIP address value192.168.1.110/16
      ValueText value, for CNAME records for instancefoo.net
      +

      Example

      + 
      foo.net,www,AAAA,,192.168.1.110/16,
      +
      +
      +{% endblock %} diff --git a/netbox/templates/dns/record_list.html b/netbox/templates/dns/record_list.html new file mode 100644 index 00000000000..d9cac2a2fa9 --- /dev/null +++ b/netbox/templates/dns/record_list.html @@ -0,0 +1,47 @@ +{% extends '_base.html' %} +{% load helpers %} +{% load form_helpers %} + +{% block title %}Records{% endblock %} + +{% block content %} +
      + {% if perms.dns.add_record %} + + + Add a record + + + + Import records + + {% endif %} + {% include 'inc/export_button.html' with obj_type='Records' %} +
      +

      Records

      +
      +
      + {% include 'utilities/obj_table.html' with bulk_edit_url='dns:record_bulk_edit' bulk_delete_url='dns:record_bulk_delete' %} +
      +
      +
      +
      + Search +
      +
      +
      +
      + + + + +
      +
      +
      +
      + {% include 'inc/filter_panel.html' %} +
      +
      +{% endblock %} diff --git a/netbox/templates/dns/zone.html b/netbox/templates/dns/zone.html new file mode 100644 index 00000000000..4f1f472d253 --- /dev/null +++ b/netbox/templates/dns/zone.html @@ -0,0 +1,142 @@ +{% extends '_base.html' %} +{% load render_table from django_tables2 %} + +{% block title %}Zone {{ zone }}{% endblock %} + +{% block content %} +
      +
      +
        +
      1. Zones
        2. +
      2. {{ zone }}
        3. +
      +
      +
      +
      +
      + + + + +
      +
      +
      +
      +
      + {% if perms.dns.change_zone %} + + + Edit this zone + + {% endif %} + {% if perms.dns.delete_zone %} + + + Delete this zone + + {% endif %} +
      +

      {{ zone }}

      +
      +
      +
      +
      + Zone +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Name{{ zone.name }}
      Records{{ record_count }}
      TTL{{ zone.ttl }}
      SOA Name{{ zone.soa_name }}
      SOA Contact{{ zone.soa_contact }}
      SOA Serial{{ zone.soa_serial }}
      SOA Refresh{{ zone.soa_refresh }}
      SOA Retry{{ zone.soa_retry }}
      SOA Expire{{ zone.soa_expire }}
      SOA Minimum{{ zone.soa_minimum }}
      Created{{ zone.created }}
      Last Updated{{ zone.last_updated }}
      +
      +
      +
      +
      +
      + Records +
      + {% if records %} + + {% for r in records %} + + + + + + + {% endfor %} +
      + {{ r }} + {{ r.record_type }} + {% if r.priority %} + {{ r.priority }} + {% else %} + - + {% endif %} + + {% if r.address %} + {{ r.address }} + {% else %} + - + {% endif %} + + {% if r.value %} + {{ r.value }} + {% else %} + - + {% endif %} +
      + {% else %} +
      None
      + {% endif %} +
      +
      +
      +{% endblock %} diff --git a/netbox/templates/dns/zone_bulk_edit.html b/netbox/templates/dns/zone_bulk_edit.html new file mode 100644 index 00000000000..917afd13722 --- /dev/null +++ b/netbox/templates/dns/zone_bulk_edit.html @@ -0,0 +1,19 @@ +{% extends 'utilities/bulk_edit_form.html' %} +{% load form_helpers %} + +{% block title %}Zone Bulk Edit{% endblock %} + +{% block select_objects_table %} + {% for zone in selected_objects %} + + {{ zone.name }} + {{ zone.ttl }} + {{ zone.soa_name }} + {{ zone.soa_contact }} + {{ zone.soa_refresh }} + {{ zone.soa_retry }} + {{ zone.soa_expire }} + {{ zone.soa_minimum }} + + {% endfor %} +{% endblock %} diff --git a/netbox/templates/dns/zone_import.html b/netbox/templates/dns/zone_import.html new file mode 100644 index 00000000000..5457144cbfc --- /dev/null +++ b/netbox/templates/dns/zone_import.html @@ -0,0 +1,82 @@ +{% extends '_base.html' %} +{% load render_table from django_tables2 %} +{% load form_helpers %} + +{% block title %}Zone Import{% endblock %} + +{% block content %} +

      Zone Import

      +
      +
      +
      + {% csrf_token %} + {% render_form form %} +
      + + Cancel +
      +
      +
      +
      +

      CSV Format

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      FieldDescriptionExample
      NameName of zonefoo.net
      TTLTime to live, in seconds10800
      SOA NameSOA name field, @ for origin@
      SOA ContactSOA contact fieldns.foo.net. noc.foo.net.
      SOA SerialSerial code of zone (string)2016070401
      SOA RefreshSOA refresh time field, in seconds3600
      SOA RetrySOA retry time field, in seconds3600
      SOA ExpireSOA expire time field, in seconds604800
      SOA MinimumSOA minimum time field, in seconds1800
      +

      Example

      + 
      foo.net,10800,@,ns.foo.net. noc.foo.net.,2016070401,3600,3600,604800,1800
      +
      +
      +{% endblock %} diff --git a/netbox/templates/dns/zone_list.html b/netbox/templates/dns/zone_list.html new file mode 100644 index 00000000000..b05019349d4 --- /dev/null +++ b/netbox/templates/dns/zone_list.html @@ -0,0 +1,46 @@ +{% extends '_base.html' %} +{% load helpers %} +{% load form_helpers %} + +{% block title %}Zones{% endblock %} + +{% block content %} +
      + {% if perms.dns.add_zone %} + + + Add a zone + + + + Import zones + + {% endif %} + {% include 'inc/export_button.html' with obj_type='Zones' %} +
      +

      Zones

      +
      +
      + {% include 'utilities/obj_table.html' with bulk_edit_url='dns:zone_bulk_edit' bulk_delete_url='dns:zone_bulk_delete' %} +
      +
      +
      +
      + Search +
      +
      +
      +
      + + + + +
      +
      +
      +
      +
      +
      +{% endblock %} diff --git a/netbox/templates/home.html b/netbox/templates/home.html index cdbc6a42719..67b6bfab847 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -122,6 +122,23 @@

      VLANs +
      +
      + DNS +
      +
      +
      + {{ stats.zone_count }} +

      Zones

      +

      Domain name system zones

      +
      +
      + {{ stats.record_count }} +

      Records

      +

      Links between a hostname and a resource

      +
      +
      +
      Circuits diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index 6834ded9e31..ea008bca72b 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -64,6 +64,16 @@

      {{ ipaddress }}

      {% endif %} + + Host Name + + {% if ipaddress.hostname %} + {{ ipaddress.hostname }} + {% else %} + None + {% endif %} + + Description @@ -130,6 +140,9 @@

      {{ ipaddress }}

      {% with heading='Related IP Addresses' %} {% render_table related_ips_table 'panel_table.html' %} {% endwith %} + {% with heading='Related DNS Records' %} + {% render_table dns_records_table 'panel_table.html' %} + {% endwith %}
      {% endblock %} diff --git a/netbox/templates/ipam/ipaddress_bulk_edit.html b/netbox/templates/ipam/ipaddress_bulk_edit.html index 8f53df1431b..cf52a3b0663 100644 --- a/netbox/templates/ipam/ipaddress_bulk_edit.html +++ b/netbox/templates/ipam/ipaddress_bulk_edit.html @@ -8,6 +8,7 @@ {{ ipaddress }} {{ ipaddress.vrf }} + {{ ipaddress.hostname }} {{ ipaddress.interface.device }} {{ ipaddress.interface }} {{ ipaddress.description }} diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html index 1be63713b06..e2b0dec02b5 100644 --- a/netbox/templates/ipam/ipaddress_edit.html +++ b/netbox/templates/ipam/ipaddress_edit.html @@ -8,6 +8,7 @@
      {% render_field form.address %} {% render_field form.vrf %} + {% render_field form.hostname %} {% if obj %}
      diff --git a/netbox/templates/ipam/ipaddress_import.html b/netbox/templates/ipam/ipaddress_import.html index a415cb56a1c..76906d683f6 100644 --- a/netbox/templates/ipam/ipaddress_import.html +++ b/netbox/templates/ipam/ipaddress_import.html @@ -38,6 +38,11 @@

      CSV Format

      VRF route distinguisher (optional) 65000:123 + + Host Name + Reverse DNS host name + foo.com + Device Device name (optional) @@ -61,7 +66,7 @@

      CSV Format

      Example

      - 
      192.0.2.42/24,65000:123,switch12,ge-0/0/31,True,Management IP
      + 
      192.0.2.42/24,65000:123,foo.com,switch12,ge-0/0/31,True,Management IP
      {% endblock %} From 2d3998497e1189aa28b98292f279308c99648324 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 20 Jul 2016 16:02:16 +0200 Subject: [PATCH 02/42] Add help texts in DNS forms --- netbox/dns/forms.py | 18 ++++++++++++++++++ netbox/templates/dns/record_import.html | 12 ++++++------ netbox/templates/dns/zone_import.html | 14 +++++++------- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py index 2b2ded7c972..6ac1f3c2a45 100644 --- a/netbox/dns/forms.py +++ b/netbox/dns/forms.py @@ -29,6 +29,16 @@ class Meta: 'soa_expire': 'SOA Expire', 'soa_minimum': 'SOA Minimum', } + help_texts = { + 'ttl': "Time to live, in seconds", + 'soa_name': "The primary name server for the domain, @ for origin", + 'soa_contact': "The responsible party for the domain (e.g. ns.foo.net. noc.foo.net.)", + 'soa_serial': "Serial string in SOA record (e.g. 2016071401)", + 'soa_refresh': "Refresh time, in seconds", + 'soa_retry': "Retry time, in seconds", + 'soa_expire': "Expire time, in seconds", + 'soa_minimum': "Negative result TTL, in seconds" + } class ZoneFromCSVForm(forms.ModelForm): @@ -69,6 +79,14 @@ class Meta: labels = { 'record_type': 'Type', } + help_texts = { + 'name': 'Host name, @ for origin (e.g. www)', + 'record_type': 'Record type (e.g. MX or AAAA)', + 'priority': 'Priority level (e.g. 10)', + 'zone': 'Zone the record belongs to', + 'address': 'IP address if value is an IP address, in AAAA records for instance', + 'value': 'Text value else, in CNAME records for instance' + } class RecordFromCSVForm(forms.ModelForm): diff --git a/netbox/templates/dns/record_import.html b/netbox/templates/dns/record_import.html index bb39e3e4f04..013ac4a3741 100644 --- a/netbox/templates/dns/record_import.html +++ b/netbox/templates/dns/record_import.html @@ -30,32 +30,32 @@

      CSV Format

      Zone name - Name of zone + Name of the zone the record belongs to foo.net Name - Name of record, @ for origin + Host name, @ for origin www Type - Type of record + Record type AAAA Priority - Priority level of record (optional) + Priority level (optional) 30 Address - IP address value + IP address if value is an IP address, in AAAA records for instance 192.168.1.110/16 Value - Text value, for CNAME records for instance + Text value else, in CNAME records for instance foo.net diff --git a/netbox/templates/dns/zone_import.html b/netbox/templates/dns/zone_import.html index 5457144cbfc..7900743e5d4 100644 --- a/netbox/templates/dns/zone_import.html +++ b/netbox/templates/dns/zone_import.html @@ -40,37 +40,37 @@

      CSV Format

      SOA Name - SOA name field, @ for origin + The primary name server for the domain, @ for origin @ SOA Contact - SOA contact field + The responsible party for the domain ns.foo.net. noc.foo.net. SOA Serial - Serial code of zone (string) + Serial string in SOA record 2016070401 SOA Refresh - SOA refresh time field, in seconds + Refresh time, in seconds 3600 SOA Retry - SOA retry time field, in seconds + Retry time, in seconds 3600 SOA Expire - SOA expire time field, in seconds + Expire time, in seconds 604800 SOA Minimum - SOA minimum time field, in seconds + Negative result TTL, in seconds 1800 From 4046d697fc257a27cc7311acf8edc4deb350c330 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 21 Jul 2016 11:33:27 +0200 Subject: [PATCH 03/42] In DNS : change search/filters & add bind exports --- netbox/dns/filters.py | 17 ++++++++++- netbox/dns/forms.py | 15 +++++++--- netbox/dns/models.py | 41 +++++++++++++++++++++++++-- netbox/dns/views.py | 27 ++++++++++++++---- netbox/templates/dns/record.html | 32 +++++++++++++++++++++ netbox/templates/dns/record_list.html | 2 +- netbox/templates/dns/zone.html | 36 +++++++++++++++++++++++ 7 files changed, 156 insertions(+), 14 deletions(-) diff --git a/netbox/dns/filters.py b/netbox/dns/filters.py index dcf38b6b325..173320c0c01 100644 --- a/netbox/dns/filters.py +++ b/netbox/dns/filters.py @@ -1,10 +1,12 @@ import django_filters +from django.db.models import Q from ipam.models import IPAddress from .models import ( Zone, Record, ) +from .forms import record_type_choices class ZoneFilter(django_filters.FilterSet): name = django_filters.CharFilter( @@ -23,14 +25,27 @@ class RecordFilter(django_filters.FilterSet): to_field_name='name', lookup_type='icontains', queryset=Zone.objects.all(), - label='Zone (name)', + label='Zone (Name)', ) + record_type = django_filters.MultipleChoiceFilter( + name='record_type', + label='Type', + choices=record_type_choices + ) name = django_filters.CharFilter( name='name', lookup_type='icontains', label='Name', ) + name_or_value = django_filters.MethodFilter( + name='name_or_value', + ) class Meta: model=Record field = ['name','record_type','value'] + + def filter_name_or_value(self, queryset, value): + if not value: + return queryset + return queryset.filter(Q(name__icontains=value) | Q(value__icontains=value)) diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py index 6ac1f3c2a45..5ba65ae34f7 100644 --- a/netbox/dns/forms.py +++ b/netbox/dns/forms.py @@ -116,12 +116,19 @@ def record_zone_choices(): zone_choices = Zone.objects.annotate(record_count=Count('records')) return [(z.name, '{} ({})'.format(z.name, z.record_count)) for z in zone_choices] -#def record_name_choices(): - #name_choices = +def record_type_choices(): + type_choices = {} + records = Record.objects.all() + for r in records: + if not r.record_type in type_choices: + type_choices[r.record_type]=1 + else: + type_choices[r.record_type]+=1 + return [(t, '{} ({})'.format(t, count)) for t,count in type_choices.items()] class RecordFilterForm(forms.Form, BootstrapMixin): zone__name = forms.MultipleChoiceField(required=False, choices=record_zone_choices, label='Zone', widget=forms.SelectMultiple(attrs={'size': 8})) - #name = forms.MultipleChoiceField(required=False, choices=record_name_choices, label='Name', widget=forms.SelectMultiple(attrs={'size': 8})) - record_type = forms.CharField(max_length=100, required=False, label='Type') + record_type = forms.MultipleChoiceField(required=False, choices=record_type_choices, label='Type', + widget=forms.SelectMultiple(attrs={'size': 8})) diff --git a/netbox/dns/models.py b/netbox/dns/models.py index 5e2528ee97c..4ca2aff3704 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -7,6 +7,8 @@ from ipam.models import IPAddress from utilities.models import CreatedUpdatedModel +import time + class Zone(CreatedUpdatedModel): """ A Zone represents a DNS zone. It contains SOA data but no records, records are represented as Record objects. @@ -43,6 +45,28 @@ def to_csv(self): str(self.soa_minimum), ]) + def to_bind(self,records): + bind_records = '' + for r in records: + bind_records += r.to_bind()+'\n' + bind_export = '\n'.join([ + '; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ', + '', + '$TTL '+str(self.ttl), + self.soa_name.ljust(30)+' IN '+'SOA '+self.soa_contact+' (', + ' '+self.soa_serial.ljust(30)+' ; serial', + ' '+str(self.soa_refresh).ljust(30)+' ; refresh', + ' '+str(self.soa_retry).ljust(30)+' ; retry', + ' '+str(self.soa_expire).ljust(30)+' ; expire', + ' '+str(self.soa_minimum).ljust(29)+') ; minimum', + '', + '', + '', + ]) + bind_export += '\n'+bind_records + bind_export += '\n'+'; end ' + return bind_export + class Record(CreatedUpdatedModel): @@ -66,6 +90,7 @@ def get_absolute_url(self): return reverse('dns:record', args=[self.pk]) def clean(self): + record_type = record_type.upper() if not self.address and not self.value: raise ValidationError("DNS records must have either an IP address or a text value") @@ -79,5 +104,17 @@ def to_csv(self): str(self.value) if self.value else '', ]) - #def to_json(self): - # return JSON + def to_bind(self): + return ''.join([ + (self.name if self.name!='@' else '').ljust(30), + ' IN ', + self.record_type.upper().ljust(10), + ' ', + (str(self.priority) if self.priority else '').ljust(4), + ' ', + (str(self.address).split('/')[0] if self.address else self.value).ljust(25), + ' ', + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ' + ]) + + diff --git a/netbox/dns/views.py b/netbox/dns/views.py index da914fb2939..c2c55c6c6a9 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -3,6 +3,7 @@ from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count from django.shortcuts import get_object_or_404, render +from django.http import HttpResponse from ipam.models import IPAddress from utilities.paginator import EnhancedPaginator @@ -30,12 +31,24 @@ def zone(request, pk): zone = get_object_or_404(Zone.objects.all(), pk=pk) records = Record.objects.filter(zone=zone) record_count = len(records) - - return render(request, 'dns/zone.html', { - 'zone': zone, - 'records': records, - 'record_count': record_count, - }) + bind_export = zone.to_bind(records) + + if request.GET.get('bind_export'): + response = HttpResponse( + bind_export, + content_type='text/plain' + ) + response['Content-Disposition'] = 'attachment; filename="netbox_{}.txt"'\ + .format(zone.name) + return response + + else: + return render(request, 'dns/zone.html', { + 'zone': zone, + 'records': records, + 'record_count': record_count, + 'bind_export': bind_export, + }) class ZoneEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dns.change_zone' @@ -94,9 +107,11 @@ class RecordListView(ObjectListView): def record(request, pk): record = get_object_or_404(Record.objects.all(), pk=pk) + bind_export = record.to_bind() return render(request, 'dns/record.html', { 'record': record, + 'bind_export': bind_export, }) class RecordEditView(PermissionRequiredMixin, ObjectEditView): diff --git a/netbox/templates/dns/record.html b/netbox/templates/dns/record.html index 1dbf25d3025..95d35e15b3a 100644 --- a/netbox/templates/dns/record.html +++ b/netbox/templates/dns/record.html @@ -102,4 +102,36 @@

      {{ record }}

      +
      +
      +
      +
      + BIND Export + Select +
      + + + + + 
      {{ bind_export }}
      +
      +
      +
      +{% endblock %} +{% block javascript %} + {% endblock %} diff --git a/netbox/templates/dns/record_list.html b/netbox/templates/dns/record_list.html index d9cac2a2fa9..d642af2c07b 100644 --- a/netbox/templates/dns/record_list.html +++ b/netbox/templates/dns/record_list.html @@ -31,7 +31,7 @@

      Records

      - +
      + + + BIND Export + {% if perms.dns.change_zone %} @@ -139,4 +143,36 @@

      {{ zone }}

      +
      +
      +
      +
      + BIND Export + Select +
      + + + + + 
      {{ bind_export }}
      +
      +
      +
      +{% endblock %} +{% block javascript %} + {% endblock %} From 6230ae13cc9fc63e448953b482326a66975caa35 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 21 Jul 2016 11:44:05 +0200 Subject: [PATCH 04/42] Add bind exports in dns api --- netbox/dns/api/serializers.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/netbox/dns/api/serializers.py b/netbox/dns/api/serializers.py index f62285bd65b..d99e6366b33 100644 --- a/netbox/dns/api/serializers.py +++ b/netbox/dns/api/serializers.py @@ -9,10 +9,18 @@ class ZoneSerializer(serializers.ModelSerializer): + bind_export = serializers.SerializerMethodField() + class Meta: model=Zone fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + def get_bind_export(self, obj): + records = Record.objects.filter(zone=obj) + return { + 'export': obj.to_bind(records), + } + class ZoneNestedSerializer(ZoneSerializer): class Meta(ZoneSerializer.Meta): @@ -27,11 +35,17 @@ class RecordSerializer(serializers.ModelSerializer): zone = ZoneNestedSerializer() address = IPAddressNestedSerializer() + bind_export = serializers.SerializerMethodField() class Meta: model=Record fields = ['id', 'name', 'record_type', 'priority', 'zone', 'address', 'value'] + def get_bind_export(self, obj): + return { + 'export': obj.to_bind(), + } + class RecordNestedSerializer(RecordSerializer): class Meta(RecordSerializer.Meta): From efe61886a078c42740a0d82a44c74b34cd97baa0 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 21 Jul 2016 13:03:39 +0200 Subject: [PATCH 05/42] Add fields to dns models Add description to zone, add category and description to record --- netbox/dns/api/serializers.py | 4 +- netbox/dns/filters.py | 39 +++++++++-------- netbox/dns/forms.py | 25 +++++++++-- .../dns/migrations/0003_auto_20160721_1059.py | 34 +++++++++++++++ netbox/dns/models.py | 43 +++++++++++-------- netbox/dns/tables.py | 6 ++- netbox/templates/dns/record.html | 19 ++++++++ netbox/templates/dns/record_bulk_edit.html | 2 + netbox/templates/dns/record_import.html | 12 +++++- netbox/templates/dns/zone.html | 10 +++++ netbox/templates/dns/zone_bulk_edit.html | 1 + netbox/templates/dns/zone_import.html | 7 ++- 12 files changed, 157 insertions(+), 45 deletions(-) create mode 100644 netbox/dns/migrations/0003_auto_20160721_1059.py diff --git a/netbox/dns/api/serializers.py b/netbox/dns/api/serializers.py index d99e6366b33..00cd0f42462 100644 --- a/netbox/dns/api/serializers.py +++ b/netbox/dns/api/serializers.py @@ -13,7 +13,7 @@ class ZoneSerializer(serializers.ModelSerializer): class Meta: model=Zone - fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] def get_bind_export(self, obj): records = Record.objects.filter(zone=obj) @@ -39,7 +39,7 @@ class RecordSerializer(serializers.ModelSerializer): class Meta: model=Record - fields = ['id', 'name', 'record_type', 'priority', 'zone', 'address', 'value'] + fields = ['id', 'name', 'category', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] def get_bind_export(self, obj): return { diff --git a/netbox/dns/filters.py b/netbox/dns/filters.py index 173320c0c01..0f54af96ee8 100644 --- a/netbox/dns/filters.py +++ b/netbox/dns/filters.py @@ -6,13 +6,13 @@ Zone, Record, ) -from .forms import record_type_choices +from .forms import record_type_choices, record_category_choices class ZoneFilter(django_filters.FilterSet): name = django_filters.CharFilter( - name='name', - lookup_type='icontains', - label='Name', + name = 'name', + lookup_type = 'icontains', + label = 'Name', ) class Meta: @@ -21,29 +21,34 @@ class Meta: class RecordFilter(django_filters.FilterSet): zone__name = django_filters.ModelMultipleChoiceFilter( - name='zone__name', - to_field_name='name', - lookup_type='icontains', - queryset=Zone.objects.all(), - label='Zone (Name)', + name = 'zone__name', + to_field_name = 'name', + lookup_type = 'icontains', + queryset = Zone.objects.all(), + label = 'Zone (Name)', ) record_type = django_filters.MultipleChoiceFilter( - name='record_type', - label='Type', - choices=record_type_choices + name = 'record_type', + label = 'Type', + choices = record_type_choices + ) + cateogry = django_filters.MultipleChoiceFilter( + name = 'category', + label = 'Category', + choices = record_category_choices ) name = django_filters.CharFilter( - name='name', - lookup_type='icontains', - label='Name', + name = 'name', + lookup_type = 'icontains', + label = 'Name', ) name_or_value = django_filters.MethodFilter( - name='name_or_value', + name = 'name_or_value', ) class Meta: model=Record - field = ['name','record_type','value'] + field = ['name', 'record_type', 'value', 'category'] def filter_name_or_value(self, queryset, value): if not value: diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py index 5ba65ae34f7..0115fe4c9c1 100644 --- a/netbox/dns/forms.py +++ b/netbox/dns/forms.py @@ -19,7 +19,7 @@ class ZoneForm(forms.ModelForm, BootstrapMixin): class Meta: model=Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] labels = { 'soa_name': 'SOA Name', 'soa_contact': 'SOA Contact', @@ -28,6 +28,7 @@ class Meta: 'soa_retry': 'SOA Retry', 'soa_expire': 'SOA Expire', 'soa_minimum': 'SOA Minimum', + 'description': 'Description', } help_texts = { 'ttl': "Time to live, in seconds", @@ -44,7 +45,7 @@ class ZoneFromCSVForm(forms.ModelForm): class Meta: model=Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] class ZoneImportForm(BulkImportForm, BootstrapMixin): csv = CSVDataField(csv_form=ZoneFromCSVForm) @@ -59,6 +60,7 @@ class ZoneBulkEditForm(forms.Form, BootstrapMixin): soa_retry = forms.IntegerField(required=False, label='SOA Retry') soa_expire = forms.IntegerField(required=False, label='SOA Expire') soa_minimum = forms.IntegerField(required=False, label='SOA Minimum') + description = forms.CharField(max_length=100, required=False, label='Description') class ZoneBulkDeleteForm(ConfirmationForm): @@ -75,13 +77,14 @@ class RecordForm(forms.ModelForm, BootstrapMixin): class Meta: model=Record - fields = ['name', 'record_type', 'priority', 'zone', 'address', 'value'] + fields = ['name', 'category', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] labels = { 'record_type': 'Type', } help_texts = { 'name': 'Host name, @ for origin (e.g. www)', 'record_type': 'Record type (e.g. MX or AAAA)', + 'category': 'Category (e.g. SLA, Server or Customer)', 'priority': 'Priority level (e.g. 10)', 'zone': 'Zone the record belongs to', 'address': 'IP address if value is an IP address, in AAAA records for instance', @@ -95,7 +98,7 @@ class RecordFromCSVForm(forms.ModelForm): class Meta: model=Record - fields = ['zone', 'name', 'record_type', 'priority', 'address', 'value'] + fields = ['zone', 'name', 'category', 'record_type', 'priority', 'address', 'value', 'description'] class RecordImportForm(BulkImportForm, BootstrapMixin): csv = CSVDataField(csv_form=RecordFromCSVForm) @@ -103,6 +106,7 @@ class RecordImportForm(BulkImportForm, BootstrapMixin): class RecordBulkEditForm(forms.Form, BootstrapMixin): pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) name = forms.CharField(max_length=100, required=False, label='Name') + category = forms.CharField(max_length=100, required=False, label='Category') record_type = forms.CharField(max_length=100, required=False, label='Type') priority = forms.IntegerField(required=False) zone = forms.ModelChoiceField(queryset=Zone.objects.all(), required=False) @@ -126,9 +130,22 @@ def record_type_choices(): type_choices[r.record_type]+=1 return [(t, '{} ({})'.format(t, count)) for t,count in type_choices.items()] +def record_category_choices(): + category_choices = {} + records = Record.objects.all() + for r in records: + if r.category: + if not r.category in category_choices: + category_choices[r.category]=1 + else: + category_choices[r.category]+=1 + return [(c, '{} ({})'.format(c, count)) for c,count in category_choices.items()] + class RecordFilterForm(forms.Form, BootstrapMixin): zone__name = forms.MultipleChoiceField(required=False, choices=record_zone_choices, label='Zone', widget=forms.SelectMultiple(attrs={'size': 8})) record_type = forms.MultipleChoiceField(required=False, choices=record_type_choices, label='Type', widget=forms.SelectMultiple(attrs={'size': 8})) + category = forms.MultipleChoiceField(required=False, choices=record_category_choices, label='Category', + widget=forms.SelectMultiple(attrs={'size': 8})) diff --git a/netbox/dns/migrations/0003_auto_20160721_1059.py b/netbox/dns/migrations/0003_auto_20160721_1059.py new file mode 100644 index 00000000000..c060e6404b4 --- /dev/null +++ b/netbox/dns/migrations/0003_auto_20160721_1059.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-21 10:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dns', '0002_auto_20160719_1058'), + ] + + operations = [ + migrations.AlterModelOptions( + name='record', + options={'ordering': ['category']}, + ), + migrations.AddField( + model_name='record', + name='category', + field=models.CharField(blank=True, max_length=20), + ), + migrations.AddField( + model_name='record', + name='description', + field=models.CharField(blank=True, max_length=20), + ), + migrations.AddField( + model_name='zone', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + ] diff --git a/netbox/dns/models.py b/netbox/dns/models.py index 4ca2aff3704..a5857cabcec 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -13,15 +13,16 @@ class Zone(CreatedUpdatedModel): """ A Zone represents a DNS zone. It contains SOA data but no records, records are represented as Record objects. """ - name=models.CharField(max_length=100) - ttl=models.PositiveIntegerField() - soa_name=models.CharField(max_length=100) - soa_contact=models.CharField(max_length=100) - soa_serial=models.CharField(max_length=100) - soa_refresh=models.PositiveIntegerField() - soa_retry=models.PositiveIntegerField() - soa_expire=models.PositiveIntegerField() - soa_minimum=models.PositiveIntegerField() + name = models.CharField(max_length=100) + ttl = models.PositiveIntegerField() + soa_name = models.CharField(max_length=100) + soa_contact = models.CharField(max_length=100) + soa_serial = models.CharField(max_length=100) + soa_refresh = models.PositiveIntegerField() + soa_retry = models.PositiveIntegerField() + soa_expire = models.PositiveIntegerField() + soa_minimum = models.PositiveIntegerField() + description = models.CharField(max_length=100, blank=True) class Meta: ordering = ['name'] @@ -43,6 +44,7 @@ def to_csv(self): str(self.soa_retry), str(self.soa_expire), str(self.soa_minimum), + self.description, ]) def to_bind(self,records): @@ -50,6 +52,7 @@ def to_bind(self,records): for r in records: bind_records += r.to_bind()+'\n' bind_export = '\n'.join([ + '; '+self.name+((' ('+self.description+')') if self.description else ''), '; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ', '', '$TTL '+str(self.ttl), @@ -73,15 +76,17 @@ class Record(CreatedUpdatedModel): """ A Record represents a DNS record, i.e. a row in a DNS zone. """ - name=models.CharField(max_length=100) - record_type=models.CharField(max_length=10) - priority=models.PositiveIntegerField(blank=True, null=True) - zone=models.ForeignKey('Zone', related_name='records', on_delete=models.CASCADE) - address=models.ForeignKey('ipam.IPAddress', related_name='records', on_delete=models.SET_NULL, blank=True, null=True) - value=models.CharField(max_length=100, blank=True) + name = models.CharField(max_length=100) + record_type = models.CharField(max_length=10) + priority = models.PositiveIntegerField(blank=True, null=True) + zone = models.ForeignKey('Zone', related_name='records', on_delete=models.CASCADE) + address = models.ForeignKey('ipam.IPAddress', related_name='records', on_delete=models.SET_NULL, blank=True, null=True) + value = models.CharField(max_length=100, blank=True) + category = models.CharField(max_length=20, blank=True) + description = models.CharField(max_length=20, blank=True) class Meta: - ordering = ['name'] + ordering = ['category'] def __unicode__(self): return self.name @@ -98,10 +103,12 @@ def to_csv(self): return ','.join([ self.zone.name, self.name, + self.category, self.record_type, str(self.priority) if self.priority else '', str(self.address) if self.address else '', - str(self.value) if self.value else '', + self.value, + self.description, ]) def to_bind(self): @@ -114,7 +121,7 @@ def to_bind(self): ' ', (str(self.address).split('/')[0] if self.address else self.value).ljust(25), ' ', - ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ' + ' ; '+self.description+' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ' ]) diff --git a/netbox/dns/tables.py b/netbox/dns/tables.py index 8d01775845a..2b48706bc20 100644 --- a/netbox/dns/tables.py +++ b/netbox/dns/tables.py @@ -30,6 +30,7 @@ class Meta(BaseTable.Meta): class RecordTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + category = tables.Column(verbose_name='Category') record_type = tables.Column(verbose_name='Type') priority = tables.Column(verbose_name='Priority') address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') @@ -38,15 +39,16 @@ class RecordTable(BaseTable): class Meta(BaseTable.Meta): model=Record - fields = ('pk', 'name', 'record_type', 'priority', 'address', 'value') + fields = ('pk', 'name', 'category', 'record_type', 'priority', 'address', 'value') class RecordBriefTable(BaseTable): name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + category = tables.Column(verbose_name='Category') record_type = tables.Column(verbose_name='Type') priority = tables.Column(verbose_name='Priority') zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') class Meta(BaseTable.Meta): model=Record - fields = ('name', 'record_type', 'priority', 'zone') + fields = ('name', 'category', 'record_type', 'priority', 'zone') \ No newline at end of file diff --git a/netbox/templates/dns/record.html b/netbox/templates/dns/record.html index 95d35e15b3a..00055d89c0e 100644 --- a/netbox/templates/dns/record.html +++ b/netbox/templates/dns/record.html @@ -56,6 +56,15 @@

      {{ record }}

      Name {{ record.name }} + + Category + + {% if record.category %} + {{ record.category }} + {% else %} + - + {% endif %} + Type {{ record.record_type }} @@ -90,6 +99,16 @@

      {{ record }}

      {% endif %} + + Description + + {% if record.description %} + {{ record.description }} + {% else %} + - + {% endif %} + + Created {{ record.created }} diff --git a/netbox/templates/dns/record_bulk_edit.html b/netbox/templates/dns/record_bulk_edit.html index d9764cfa110..e5a389a0351 100644 --- a/netbox/templates/dns/record_bulk_edit.html +++ b/netbox/templates/dns/record_bulk_edit.html @@ -7,11 +7,13 @@ {% for record in selected_objects %} {{ record.name }} + {{ record.category }} {{ record.record_type }} {{ record.priority }} {{ record.address }} {{ record.value }} {{ record.zone }} + {{ record.description }} {% endfor %} {% endblock %} diff --git a/netbox/templates/dns/record_import.html b/netbox/templates/dns/record_import.html index 013ac4a3741..28ca8bc6dc9 100644 --- a/netbox/templates/dns/record_import.html +++ b/netbox/templates/dns/record_import.html @@ -38,6 +38,11 @@

      CSV Format

      Host name, @ for origin www + + Category + Category (e.g. SLA, Server or Customer ; optional) + Server + Type Record type @@ -58,10 +63,15 @@

      CSV Format

      Text value else, in CNAME records for instance foo.net + + Description + Description (optional) + Backend API server +

      Example

      - 
      foo.net,www,AAAA,,192.168.1.110/16,
      + 
      foo.net,www,Server,AAAA,,192.168.1.110/16,,Backend API server
      {% endblock %} diff --git a/netbox/templates/dns/zone.html b/netbox/templates/dns/zone.html index 58ec0ec4583..4b76d5ea819 100644 --- a/netbox/templates/dns/zone.html +++ b/netbox/templates/dns/zone.html @@ -90,6 +90,16 @@

      {{ zone }}

      SOA Minimum {{ zone.soa_minimum }} + + Description + + {% if zone.description %} + {{ zone.description }} + {% else %} + - + {% endif %} + + Created {{ zone.created }} diff --git a/netbox/templates/dns/zone_bulk_edit.html b/netbox/templates/dns/zone_bulk_edit.html index 917afd13722..6d61fc60aaf 100644 --- a/netbox/templates/dns/zone_bulk_edit.html +++ b/netbox/templates/dns/zone_bulk_edit.html @@ -14,6 +14,7 @@ {{ zone.soa_retry }} {{ zone.soa_expire }} {{ zone.soa_minimum }} + {{ zone.description }} {% endfor %} {% endblock %} diff --git a/netbox/templates/dns/zone_import.html b/netbox/templates/dns/zone_import.html index 7900743e5d4..62dd3e8d0c3 100644 --- a/netbox/templates/dns/zone_import.html +++ b/netbox/templates/dns/zone_import.html @@ -73,10 +73,15 @@

      CSV Format

      Negative result TTL, in seconds 1800 + + Description + Description (optional) + Mail servers zone +

      Example

      - 
      foo.net,10800,@,ns.foo.net. noc.foo.net.,2016070401,3600,3600,604800,1800
      + 
      foo.net,10800,@,ns.foo.net. noc.foo.net.,2016070401,3600,3600,604800,1800,Mail servers zone
      {% endblock %} From 117bf1a118defead7f6843b4fa777d02c5c37e74 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Fri, 22 Jul 2016 12:28:19 +0200 Subject: [PATCH 06/42] Remove category field in record & add auto-updating serial in zone --- docs/data-model/dns.md | 8 +++- netbox/dns/filters.py | 9 +--- netbox/dns/forms.py | 33 ++++++--------- .../dns/migrations/0004_auto_20160722_0820.py | 29 +++++++++++++ netbox/dns/models.py | 42 ++++++++++++++++--- netbox/dns/tables.py | 6 +-- netbox/dns/views.py | 10 ++++- netbox/templates/dns/record.html | 11 +---- netbox/templates/dns/record_bulk_edit.html | 1 - netbox/templates/dns/record_import.html | 7 +--- netbox/templates/dns/zone.html | 2 +- netbox/templates/dns/zone_import.html | 7 +--- 12 files changed, 99 insertions(+), 66 deletions(-) create mode 100644 netbox/dns/migrations/0004_auto_20160722_0820.py diff --git a/docs/data-model/dns.md b/docs/data-model/dns.md index 3951e9c41a6..5ac5218f0cf 100644 --- a/docs/data-model/dns.md +++ b/docs/data-model/dns.md @@ -4,8 +4,12 @@ The DNS component of NetBox deals with the management of DNS zones. A zone corresponds to a zone file in a DNS server, it stores the SOA (Start Of Authority) record and other records that are stored as Record objects. -As zones are readable through the REST API, it is possible to write some external script which automatically generates zone files for a DNS server, -this feature is not directly provided by NetBox though. +The SOA Serial field is automatically created and updated each time something changes in the zone, i.e. each time you edit IP addresses or records +belonging to the zone, or the zone itself. It's in the following format : YYYYMMDDN with Y the year, M the month, D the day and N a counter. + +Every zone can be exported as a zone file in BIND format, directly readable by a DNS server. As zones are readable through the REST API, +with a field containing their BIND format, it is possible to write an external script which automatically updates a DNS server +configuration from the Netbox database. --- diff --git a/netbox/dns/filters.py b/netbox/dns/filters.py index 0f54af96ee8..480aa956a2c 100644 --- a/netbox/dns/filters.py +++ b/netbox/dns/filters.py @@ -6,7 +6,7 @@ Zone, Record, ) -from .forms import record_type_choices, record_category_choices +from .forms import record_type_choices class ZoneFilter(django_filters.FilterSet): name = django_filters.CharFilter( @@ -32,11 +32,6 @@ class RecordFilter(django_filters.FilterSet): label = 'Type', choices = record_type_choices ) - cateogry = django_filters.MultipleChoiceFilter( - name = 'category', - label = 'Category', - choices = record_category_choices - ) name = django_filters.CharFilter( name = 'name', lookup_type = 'icontains', @@ -48,7 +43,7 @@ class RecordFilter(django_filters.FilterSet): class Meta: model=Record - field = ['name', 'record_type', 'value', 'category'] + field = ['name', 'record_type', 'value'] def filter_name_or_value(self, queryset, value): if not value: diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py index 0115fe4c9c1..72f8dc7d8c4 100644 --- a/netbox/dns/forms.py +++ b/netbox/dns/forms.py @@ -19,11 +19,10 @@ class ZoneForm(forms.ModelForm, BootstrapMixin): class Meta: model=Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] labels = { 'soa_name': 'SOA Name', 'soa_contact': 'SOA Contact', - 'soa_serial': 'SOA Serial', 'soa_refresh': 'SOA Refresh', 'soa_retry': 'SOA Retry', 'soa_expire': 'SOA Expire', @@ -34,7 +33,6 @@ class Meta: 'ttl': "Time to live, in seconds", 'soa_name': "The primary name server for the domain, @ for origin", 'soa_contact': "The responsible party for the domain (e.g. ns.foo.net. noc.foo.net.)", - 'soa_serial': "Serial string in SOA record (e.g. 2016071401)", 'soa_refresh': "Refresh time, in seconds", 'soa_retry': "Retry time, in seconds", 'soa_expire': "Expire time, in seconds", @@ -45,7 +43,7 @@ class ZoneFromCSVForm(forms.ModelForm): class Meta: model=Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] class ZoneImportForm(BulkImportForm, BootstrapMixin): csv = CSVDataField(csv_form=ZoneFromCSVForm) @@ -77,14 +75,13 @@ class RecordForm(forms.ModelForm, BootstrapMixin): class Meta: model=Record - fields = ['name', 'category', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] + fields = ['name', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] labels = { 'record_type': 'Type', } help_texts = { 'name': 'Host name, @ for origin (e.g. www)', 'record_type': 'Record type (e.g. MX or AAAA)', - 'category': 'Category (e.g. SLA, Server or Customer)', 'priority': 'Priority level (e.g. 10)', 'zone': 'Zone the record belongs to', 'address': 'IP address if value is an IP address, in AAAA records for instance', @@ -98,7 +95,15 @@ class RecordFromCSVForm(forms.ModelForm): class Meta: model=Record - fields = ['zone', 'name', 'category', 'record_type', 'priority', 'address', 'value', 'description'] + fields = ['zone', 'name', 'record_type', 'priority', 'address', 'value', 'description'] + +# class RecordBINDImportForm(forms.Form, BootstrapMixin): +# bind = BINDDataField() +# zone_name = CharField(max_length=100, label='Zone') +# slash_v4 = IntegerField() + +# def clean(self): +# self.cleaned_data class RecordImportForm(BulkImportForm, BootstrapMixin): csv = CSVDataField(csv_form=RecordFromCSVForm) @@ -106,7 +111,6 @@ class RecordImportForm(BulkImportForm, BootstrapMixin): class RecordBulkEditForm(forms.Form, BootstrapMixin): pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) name = forms.CharField(max_length=100, required=False, label='Name') - category = forms.CharField(max_length=100, required=False, label='Category') record_type = forms.CharField(max_length=100, required=False, label='Type') priority = forms.IntegerField(required=False) zone = forms.ModelChoiceField(queryset=Zone.objects.all(), required=False) @@ -130,22 +134,9 @@ def record_type_choices(): type_choices[r.record_type]+=1 return [(t, '{} ({})'.format(t, count)) for t,count in type_choices.items()] -def record_category_choices(): - category_choices = {} - records = Record.objects.all() - for r in records: - if r.category: - if not r.category in category_choices: - category_choices[r.category]=1 - else: - category_choices[r.category]+=1 - return [(c, '{} ({})'.format(c, count)) for c,count in category_choices.items()] - class RecordFilterForm(forms.Form, BootstrapMixin): zone__name = forms.MultipleChoiceField(required=False, choices=record_zone_choices, label='Zone', widget=forms.SelectMultiple(attrs={'size': 8})) record_type = forms.MultipleChoiceField(required=False, choices=record_type_choices, label='Type', widget=forms.SelectMultiple(attrs={'size': 8})) - category = forms.MultipleChoiceField(required=False, choices=record_category_choices, label='Category', - widget=forms.SelectMultiple(attrs={'size': 8})) diff --git a/netbox/dns/migrations/0004_auto_20160722_0820.py b/netbox/dns/migrations/0004_auto_20160722_0820.py new file mode 100644 index 00000000000..5087660aaf5 --- /dev/null +++ b/netbox/dns/migrations/0004_auto_20160722_0820.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-22 08:20 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('dns', '0003_auto_20160721_1059'), + ] + + operations = [ + migrations.AlterModelOptions( + name='record', + options={'ordering': ['name']}, + ), + migrations.RemoveField( + model_name='record', + name='category', + ), + migrations.AlterField( + model_name='record', + name='address', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='records', to='ipam.IPAddress'), + ), + ] diff --git a/netbox/dns/models.py b/netbox/dns/models.py index a5857cabcec..4efb3ba907e 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -4,7 +4,7 @@ from django.core.urlresolvers import reverse from django.db import models -from ipam.models import IPAddress +#from ipam.models import IPAddress from utilities.models import CreatedUpdatedModel import time @@ -33,6 +33,29 @@ def __unicode__(self): def get_absolute_url(self): return reverse('dns:zone', args=[self.pk]) + def save(self, *args, **kwargs): + self.update_serial() + super(Zone, self).save(*args, **kwargs) + + def update_serial(self): + """ + Each time a record or the zone is modified, the serial is incremented. + """ + current_date = time.strftime('%Y%m%d',time.localtime()) + if not self.soa_serial: + self.soa_serial = current_date+'1' + else: + serial_date = self.soa_serial[:8] + serial_num = self.soa_serial[8:] + + if serial_date!=current_date: + self.soa_serial = current_date+'1' + else: + serial_num = int(serial_num) + serial_num += 1 + self.soa_serial = current_date + str(serial_num) + + def to_csv(self): return ','.join([ self.name, @@ -80,13 +103,12 @@ class Record(CreatedUpdatedModel): record_type = models.CharField(max_length=10) priority = models.PositiveIntegerField(blank=True, null=True) zone = models.ForeignKey('Zone', related_name='records', on_delete=models.CASCADE) - address = models.ForeignKey('ipam.IPAddress', related_name='records', on_delete=models.SET_NULL, blank=True, null=True) + address = models.ForeignKey('ipam.IPAddress', related_name='records', on_delete=models.PROTECT, blank=True, null=True) value = models.CharField(max_length=100, blank=True) - category = models.CharField(max_length=20, blank=True) description = models.CharField(max_length=20, blank=True) class Meta: - ordering = ['category'] + ordering = ['name'] def __unicode__(self): return self.name @@ -95,15 +117,23 @@ def get_absolute_url(self): return reverse('dns:record', args=[self.pk]) def clean(self): - record_type = record_type.upper() + self.record_type = self.record_type.upper() if not self.address and not self.value: raise ValidationError("DNS records must have either an IP address or a text value") + + def save(self, *args, **kwargs): + self.zone.save() # in order to update serial. + super(Record, self).save(*args, **kwargs) + + #POST_DELETE RECEIVER !!! + def delete(self, *args, **kwargs): + self.zone.save() # in order to update serial. + super(Record, self).delete(*args, **kwargs) def to_csv(self): return ','.join([ self.zone.name, self.name, - self.category, self.record_type, str(self.priority) if self.priority else '', str(self.address) if self.address else '', diff --git a/netbox/dns/tables.py b/netbox/dns/tables.py index 2b48706bc20..8d01775845a 100644 --- a/netbox/dns/tables.py +++ b/netbox/dns/tables.py @@ -30,7 +30,6 @@ class Meta(BaseTable.Meta): class RecordTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') - category = tables.Column(verbose_name='Category') record_type = tables.Column(verbose_name='Type') priority = tables.Column(verbose_name='Priority') address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') @@ -39,16 +38,15 @@ class RecordTable(BaseTable): class Meta(BaseTable.Meta): model=Record - fields = ('pk', 'name', 'category', 'record_type', 'priority', 'address', 'value') + fields = ('pk', 'name', 'record_type', 'priority', 'address', 'value') class RecordBriefTable(BaseTable): name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') - category = tables.Column(verbose_name='Category') record_type = tables.Column(verbose_name='Type') priority = tables.Column(verbose_name='Priority') zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') class Meta(BaseTable.Meta): model=Record - fields = ('name', 'category', 'record_type', 'priority', 'zone') + fields = ('name', 'record_type', 'priority', 'zone') \ No newline at end of file diff --git a/netbox/dns/views.py b/netbox/dns/views.py index c2c55c6c6a9..2dd35b6aea2 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -83,7 +83,10 @@ def update_objects(self, pk_list, form): if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] - return self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update) + zlist = self.cls.objects.filter(pk__in=pk_list) + for z in zlist: + z.save() + return zlist.update(**fields_to_update) class ZoneBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): @@ -146,7 +149,10 @@ def update_objects(self, pk_list, form): if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] - return self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update) + rlist = self.cls.objects.filter(pk__in=pk_list) + if rlist: + rlist[0].save() + return rlist.update(**fields_to_update) class RecordBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dns.delete_record' diff --git a/netbox/templates/dns/record.html b/netbox/templates/dns/record.html index 00055d89c0e..8e7cbdf4248 100644 --- a/netbox/templates/dns/record.html +++ b/netbox/templates/dns/record.html @@ -56,15 +56,6 @@

      {{ record }}

      Name {{ record.name }} - - Category - - {% if record.category %} - {{ record.category }} - {% else %} - - - {% endif %} - Type {{ record.record_type }} @@ -130,7 +121,7 @@

      {{ record }}

      - + 
      {{ bind_export }}

      {{ bind_export }}
      diff --git a/netbox/templates/dns/record_bulk_edit.html b/netbox/templates/dns/record_bulk_edit.html index e5a389a0351..5e4586bfa38 100644 --- a/netbox/templates/dns/record_bulk_edit.html +++ b/netbox/templates/dns/record_bulk_edit.html @@ -7,7 +7,6 @@ {% for record in selected_objects %} {{ record.name }} - {{ record.category }} {{ record.record_type }} {{ record.priority }} {{ record.address }} diff --git a/netbox/templates/dns/record_import.html b/netbox/templates/dns/record_import.html index 28ca8bc6dc9..ca428a2e5b5 100644 --- a/netbox/templates/dns/record_import.html +++ b/netbox/templates/dns/record_import.html @@ -38,11 +38,6 @@

      CSV Format

      Host name, @ for origin www - - Category - Category (e.g. SLA, Server or Customer ; optional) - Server - Type Record type @@ -71,7 +66,7 @@

      CSV Format

      Example

      - 
      foo.net,www,Server,AAAA,,192.168.1.110/16,,Backend API server
      + 
      foo.net,www,AAAA,,192.168.1.110/16,,Backend API server
      {% endblock %} diff --git a/netbox/templates/dns/zone.html b/netbox/templates/dns/zone.html index 4b76d5ea819..317278c86d4 100644 --- a/netbox/templates/dns/zone.html +++ b/netbox/templates/dns/zone.html @@ -162,7 +162,7 @@

      {{ zone }}

      - + 
      {{ bind_export }}

      {{ bind_export }}
      diff --git a/netbox/templates/dns/zone_import.html b/netbox/templates/dns/zone_import.html index 62dd3e8d0c3..e24a6ebcef5 100644 --- a/netbox/templates/dns/zone_import.html +++ b/netbox/templates/dns/zone_import.html @@ -48,11 +48,6 @@

      CSV Format

      The responsible party for the domain ns.foo.net. noc.foo.net. - - SOA Serial - Serial string in SOA record - 2016070401 - SOA Refresh Refresh time, in seconds @@ -81,7 +76,7 @@

      CSV Format

      Example

      - 
      foo.net,10800,@,ns.foo.net. noc.foo.net.,2016070401,3600,3600,604800,1800,Mail servers zone
      + 
      foo.net,10800,@,ns.foo.net. noc.foo.net.,3600,3600,604800,1800,Mail servers zone
      {% endblock %} From 02e142e1dea671abb5987fa37379977f61f8fcdc Mon Sep 17 00:00:00 2001 From: rdujardin Date: Fri, 22 Jul 2016 15:59:50 +0200 Subject: [PATCH 07/42] Fix zone serial updating on records bulk delete --- netbox/dns/models.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/netbox/dns/models.py b/netbox/dns/models.py index 4efb3ba907e..dff771c1d7f 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -9,6 +9,9 @@ import time +from django.db.models.signals import pre_delete +from django.dispatch import receiver + class Zone(CreatedUpdatedModel): """ A Zone represents a DNS zone. It contains SOA data but no records, records are represented as Record objects. @@ -125,11 +128,6 @@ def save(self, *args, **kwargs): self.zone.save() # in order to update serial. super(Record, self).save(*args, **kwargs) - #POST_DELETE RECEIVER !!! - def delete(self, *args, **kwargs): - self.zone.save() # in order to update serial. - super(Record, self).delete(*args, **kwargs) - def to_csv(self): return ','.join([ self.zone.name, @@ -154,4 +152,8 @@ def to_bind(self): ' ; '+self.description+' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ' ]) +@receiver(pre_delete, sender=Record) +def on_record_delete(sender, **kwargs): + kwargs['instance'].zone.save() + From 90ea56489d132592c09c2f844b828d5af3bd4d59 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Fri, 22 Jul 2016 16:01:19 +0200 Subject: [PATCH 08/42] Add reverse DNS --- .../migrations/0007_auto_20160722_0958.py | 55 ++++++++ netbox/ipam/models.py | 124 +++++++++++++++++- netbox/ipam/views.py | 15 ++- netbox/templates/ipam/prefix.html | 39 ++++++ 4 files changed, 230 insertions(+), 3 deletions(-) create mode 100644 netbox/ipam/migrations/0007_auto_20160722_0958.py diff --git a/netbox/ipam/migrations/0007_auto_20160722_0958.py b/netbox/ipam/migrations/0007_auto_20160722_0958.py new file mode 100644 index 00000000000..8e153e5513d --- /dev/null +++ b/netbox/ipam/migrations/0007_auto_20160722_0958.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-22 09:58 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0006_auto_20160720_0941'), + ] + + operations = [ + migrations.AddField( + model_name='prefix', + name='soa_contact', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AddField( + model_name='prefix', + name='soa_expire', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='prefix', + name='soa_minimum', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='prefix', + name='soa_name', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AddField( + model_name='prefix', + name='soa_refresh', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='prefix', + name='soa_retry', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='prefix', + name='soa_serial', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AddField( + model_name='prefix', + name='ttl', + field=models.PositiveIntegerField(blank=True, null=True), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 87ebfb70579..a72b9eeb618 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -8,9 +8,12 @@ from dcim.models import Interface from utilities.models import CreatedUpdatedModel +import dns.models from .fields import IPNetworkField, IPAddressField +import time, ipaddress + AF_CHOICES = ( (4, 'IPv4'), @@ -233,10 +236,21 @@ class Prefix(CreatedUpdatedModel): verbose_name='VLAN') status = models.PositiveSmallIntegerField('Status', choices=PREFIX_STATUS_CHOICES, default=1) role = models.ForeignKey('Role', related_name='prefixes', on_delete=models.SET_NULL, blank=True, null=True) - description = models.CharField(max_length=100, blank=True) objects = PrefixQuerySet.as_manager() + #Reverse DNS + ttl = models.PositiveIntegerField(blank=True, null=True) + soa_name = models.CharField(max_length=100, blank=True) + soa_contact = models.CharField(max_length=100, blank=True) + soa_serial = models.CharField(max_length=100, blank=True) + soa_refresh = models.PositiveIntegerField(blank=True, null=True) + soa_retry = models.PositiveIntegerField(blank=True, null=True) + soa_expire = models.PositiveIntegerField(blank=True, null=True) + soa_minimum = models.PositiveIntegerField(blank=True, null=True) + + description = models.CharField(max_length=100, blank=True) + class Meta: ordering = ['family', 'prefix'] verbose_name_plural = 'prefixes' @@ -257,6 +271,7 @@ def clean(self): "instead.") def save(self, *args, **kwargs): + self.update_serial() if self.prefix: # Clear host bits from prefix self.prefix = self.prefix.cidr @@ -264,6 +279,24 @@ def save(self, *args, **kwargs): self.family = self.prefix.version super(Prefix, self).save(*args, **kwargs) + def update_serial(self): + """ + Each time a record or the zone is modified, the serial is incremented. + """ + current_date = time.strftime('%Y%m%d',time.localtime()) + if not self.soa_serial: + self.soa_serial = current_date+'1' + else: + serial_date = self.soa_serial[:8] + serial_num = self.soa_serial[8:] + + if serial_date!=current_date: + self.soa_serial = current_date+'1' + else: + serial_num = int(serial_num) + serial_num += 1 + self.soa_serial = current_date + str(serial_num) + def to_csv(self): return ','.join([ str(self.prefix), @@ -288,6 +321,92 @@ def new_subnet(self): def get_status_class(self): return STATUS_CHOICE_CLASSES[self.status] + def to_bind(self,ipaddresses): + + zones = {} + + def header (zone_id): return '\n'.join([ + '; '+zone_id, + '; gen from prefix '+str(self.prefix)+' ('+(self.description if self.description else '')+') by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ', + '', + '$TTL '+str(self.ttl), + self.soa_name.ljust(30)+' IN '+'SOA '+self.soa_contact+' (', + ' '+self.soa_serial.ljust(30)+' ; serial', + ' '+str(self.soa_refresh).ljust(30)+' ; refresh', + ' '+str(self.soa_retry).ljust(30)+' ; retry', + ' '+str(self.soa_expire).ljust(30)+' ; expire', + ' '+str(self.soa_minimum).ljust(29)+') ; minimum', + '', + '', + '', + '$ORIGIN '+zone_id, + '', + '', + ]) + + if self.prefix.version == 4: + pbytes = str(self.prefix).split('/')[0].split('.') + pslash = int(str(self.prefix).split('/')[1]) + + if pslash > 16: + # create /24 zones + ztype = 24 + else: + # create /16 zones + ztype = 16 + + for ip in ipaddresses: + ibytes = str(ip.address).split('/')[0].split('.') + islash = str(ip.address).split('/')[1] + + if ztype == 24: + zone_id = ibytes[2]+'.'+ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + + + else: + zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + + else: + pfull = str(ipaddress.IPv6Address(str(self.prefix).split('/')[0]).exploded) + pnibbles = pfull.split(':') + pdigits = pfull.replace(':','') + pslash = int(str(self.prefix).split('/')[1]) + + ztype = pslash if pslash % 16 == 0 else pslash/16+16 + + for ip in ipaddresses: + ifull = str(ipaddress.IPv6Address(str(ip.address).split('/')[0]).exploded) + inibbles = ifull.split(':') + idigits = ifull.replace(':','').reverse + islash = int(str(ip.address).split('/')[1]) + + pdigitszone = pdigits[:ztype/4].reverse + zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + + zones[zone_id] += ('.'.join(idigits[:32-ztype/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + + + for z in zones: + z += '\n\n; end ' + + ret = [] + for zid,zc in zones.items(): + ret.append({ + 'num': len(ret), + 'id': zid, + 'content': zc, + }) + + return ret + class IPAddress(CreatedUpdatedModel): """ @@ -341,6 +460,9 @@ def save(self, *args, **kwargs): if self.address: # Infer address family from IPAddress object self.family = self.address.version + dns_records = dns.models.Record.objects.filter(address=self) + for r in dns_records: + r.save() super(IPAddress, self).save(*args, **kwargs) def to_csv(self): diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 5496d2c4af4..cfc0d39c8de 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -276,8 +276,14 @@ def prefix(request, pk): except Aggregate.DoesNotExist: aggregate = None + child_ip = IPAddress.objects.filter(address__net_contained_or_equal=str(prefix.prefix)) + # Count child IP addresses - ipaddress_count = IPAddress.objects.filter(address__net_contained_or_equal=str(prefix.prefix)).count() + ipaddress_count = child_ip.count() + + # BIND reverse export + bind_export = prefix.to_bind(child_ip) + bind_export_count = len(bind_export) # Parent prefixes table parent_prefixes = Prefix.objects.filter(vrf=prefix.vrf, prefix__net_contains=str(prefix.prefix))\ @@ -307,6 +313,8 @@ def prefix(request, pk): 'parent_prefix_table': parent_prefix_table, 'child_prefix_table': child_prefix_table, 'duplicate_prefix_table': duplicate_prefix_table, + 'bind_export': bind_export, + 'bind_export_count': bind_export_count, }) @@ -481,7 +489,10 @@ def update_objects(self, pk_list, form): if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] - return self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update) + iplist = self.cls.objects.filter(pk__in=pk_list) + for ip in iplist: + ip.save() # in order to update dns zones serials + return iplist.update(**fields_to_update) class IPAddressBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 6403717f497..76c03b12996 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -113,4 +113,43 @@ {% endif %} +
      +
      +
      +
      + BIND Reverse Exports +
      + + {% for z in bind_export %} + + + {% endfor %} +
      + {{ z.id }} + Select +
      + 

      {{ z.content }}

      +
      +
      +
      +
      +{% endblock %} +{% block javascript %} + {% endblock %} From 0a39945afb11a7ee9bcd5cdb37a056884081421c Mon Sep 17 00:00:00 2001 From: rdujardin Date: Fri, 22 Jul 2016 16:49:34 +0200 Subject: [PATCH 09/42] Fix bug in ipv6 reverse dns --- netbox/ipam/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index a72b9eeb618..7ee53ad4a78 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -373,7 +373,7 @@ def header (zone_id): return '\n'.join([ zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' else: - pfull = str(ipaddress.IPv6Address(str(self.prefix).split('/')[0]).exploded) + pfull = str(ipaddress.IPv6Address(unicode(str(self.prefix).split('/')[0])).exploded) pnibbles = pfull.split(':') pdigits = pfull.replace(':','') pslash = int(str(self.prefix).split('/')[1]) From d6fd35dfd56c983f0c37538664a7290b9f714b8a Mon Sep 17 00:00:00 2001 From: rdujardin Date: Fri, 22 Jul 2016 16:53:09 +0200 Subject: [PATCH 10/42] Fix bug in ipv6 reverse dns (bis) --- netbox/ipam/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 7ee53ad4a78..e3959a9a022 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -381,7 +381,7 @@ def header (zone_id): return '\n'.join([ ztype = pslash if pslash % 16 == 0 else pslash/16+16 for ip in ipaddresses: - ifull = str(ipaddress.IPv6Address(str(ip.address).split('/')[0]).exploded) + ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) inibbles = ifull.split(':') idigits = ifull.replace(':','').reverse islash = int(str(ip.address).split('/')[1]) From 7df6353296ecc88a3f491aca92fe7c4652765818 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Fri, 22 Jul 2016 17:24:40 +0200 Subject: [PATCH 11/42] Fix bug in ipv6 reverse dns (ter) --- netbox/ipam/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index e3959a9a022..fc8fc403aca 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -383,10 +383,10 @@ def header (zone_id): return '\n'.join([ for ip in ipaddresses: ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) inibbles = ifull.split(':') - idigits = ifull.replace(':','').reverse + idigits = ifull.replace(':','')[::-1] islash = int(str(ip.address).split('/')[1]) - pdigitszone = pdigits[:ztype/4].reverse + pdigitszone = pdigits[:ztype/4][::-1] zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' if not zone_id in zones: zones[zone_id] = header(zone_id) From 2478b354d10fa117b64d6438d5b2aef1542d0d0a Mon Sep 17 00:00:00 2001 From: rdujardin Date: Tue, 26 Jul 2016 10:56:39 +0200 Subject: [PATCH 12/42] Modify reverse bind export output the whole zone if prefix is smaller than the zone --- netbox/ipam/models.py | 60 +++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index fc8fc403aca..e8e19b82121 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -13,6 +13,7 @@ from .fields import IPNetworkField, IPAddressField import time, ipaddress +import netaddr AF_CHOICES = ( @@ -349,28 +350,34 @@ def header (zone_id): return '\n'.join([ pslash = int(str(self.prefix).split('/')[1]) if pslash > 16: - # create /24 zones - ztype = 24 + zslash = 24 else: - # create /16 zones - ztype = 16 + zslash = 16 + if pslash > zslash: + pslash = zslash + + p = IPNetwork(unicode('.'.join(pbytes)+'/'+str(pslash))) + + ipaddresses = IPAddress.objects.filter(family=4) for ip in ipaddresses: ibytes = str(ip.address).split('/')[0].split('.') islash = str(ip.address).split('/')[1] + i = netaddr.IPAddress(unicode('.'.join(ibytes))) + + if i in p: + if zslash == 24: + zone_id = ibytes[2] + '.' + ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + else: + zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' - if ztype == 24: - zone_id = ibytes[2]+'.'+ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' - if not zone_id in zones: - zones[zone_id] = header(zone_id) - zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' - - - else: - zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' - if not zone_id in zones: - zones[zone_id] = header(zone_id) - zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + else: pfull = str(ipaddress.IPv6Address(unicode(str(self.prefix).split('/')[0])).exploded) @@ -378,20 +385,29 @@ def header (zone_id): return '\n'.join([ pdigits = pfull.replace(':','') pslash = int(str(self.prefix).split('/')[1]) - ztype = pslash if pslash % 16 == 0 else pslash/16+16 + zslash = pslash if pslash % 16 == 0 else pslash/16+16 + if pslash > zslash: + pslash = zslash + p = IPNetwork(unicode(pfull+'/'+str(pslash))) + + ipaddresses = IPAddress.objects.filter(family=6) for ip in ipaddresses: ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) inibbles = ifull.split(':') idigits = ifull.replace(':','')[::-1] islash = int(str(ip.address).split('/')[1]) - pdigitszone = pdigits[:ztype/4][::-1] - zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' - if not zone_id in zones: - zones[zone_id] = header(zone_id) + i = netaddr.IPAddress(unicode(ifull)) + + if i in p: + + pdigitszone = pdigits[:pslash/4][::-1] + zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) - zones[zone_id] += ('.'.join(idigits[:32-ztype/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + zones[zone_id] += ('.'.join(idigits[:32-pslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' for z in zones: From 89a0049532b6d72d68acab86c47138f475b40147 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Tue, 26 Jul 2016 11:22:28 +0200 Subject: [PATCH 13/42] Reverse last commit for ipv6 reverse dns --- netbox/ipam/models.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index e8e19b82121..7642e3b670d 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -386,28 +386,19 @@ def header (zone_id): return '\n'.join([ pslash = int(str(self.prefix).split('/')[1]) zslash = pslash if pslash % 16 == 0 else pslash/16+16 - if pslash > zslash: - pslash = zslash - - p = IPNetwork(unicode(pfull+'/'+str(pslash))) - ipaddresses = IPAddress.objects.filter(family=6) for ip in ipaddresses: ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) inibbles = ifull.split(':') idigits = ifull.replace(':','')[::-1] islash = int(str(ip.address).split('/')[1]) - i = netaddr.IPAddress(unicode(ifull)) - - if i in p: - - pdigitszone = pdigits[:pslash/4][::-1] - zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' - if not zone_id in zones: - zones[zone_id] = header(zone_id) + pdigitszone = pdigits[:zslash/4][::-1] + zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) - zones[zone_id] += ('.'.join(idigits[:32-pslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' for z in zones: From 5282eee5ce906cf200c9825abcf45ef22eeeb37c Mon Sep 17 00:00:00 2001 From: rdujardin Date: Tue, 26 Jul 2016 11:28:31 +0200 Subject: [PATCH 14/42] Don't handle ip without host names in reverse DNS --- netbox/ipam/models.py | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 7642e3b670d..759b7bfeba2 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -361,21 +361,22 @@ def header (zone_id): return '\n'.join([ ipaddresses = IPAddress.objects.filter(family=4) for ip in ipaddresses: - ibytes = str(ip.address).split('/')[0].split('.') - islash = str(ip.address).split('/')[1] - i = netaddr.IPAddress(unicode('.'.join(ibytes))) - - if i in p: - if zslash == 24: - zone_id = ibytes[2] + '.' + ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.' - if not zone_id in zones: - zones[zone_id] = header(zone_id) - zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' - else: - zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' - if not zone_id in zones: - zones[zone_id] = header(zone_id) - zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + if ip.hostname: + ibytes = str(ip.address).split('/')[0].split('.') + islash = str(ip.address).split('/')[1] + i = netaddr.IPAddress(unicode('.'.join(ibytes))) + + if i in p: + if zslash == 24: + zone_id = ibytes[2] + '.' + ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + else: + zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' @@ -388,17 +389,18 @@ def header (zone_id): return '\n'.join([ zslash = pslash if pslash % 16 == 0 else pslash/16+16 for ip in ipaddresses: - ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) - inibbles = ifull.split(':') - idigits = ifull.replace(':','')[::-1] - islash = int(str(ip.address).split('/')[1]) - - pdigitszone = pdigits[:zslash/4][::-1] - zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' - if not zone_id in zones: - zones[zone_id] = header(zone_id) - - zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + if ip.hostname: + ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) + inibbles = ifull.split(':') + idigits = ifull.replace(':','')[::-1] + islash = int(str(ip.address).split('/')[1]) + + pdigitszone = pdigits[:zslash/4][::-1] + zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' + if not zone_id in zones: + zones[zone_id] = header(zone_id) + + zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' for z in zones: From 03a65f11a66f8912be1d72d9dceba3881f5d4267 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Tue, 26 Jul 2016 12:43:15 +0200 Subject: [PATCH 15/42] Fix bug on "select" link in bind export in prefix page --- netbox/templates/dns/record.html | 2 +- netbox/templates/dns/zone.html | 2 +- netbox/templates/ipam/prefix.html | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/netbox/templates/dns/record.html b/netbox/templates/dns/record.html index 8e7cbdf4248..de4f4cfb4b5 100644 --- a/netbox/templates/dns/record.html +++ b/netbox/templates/dns/record.html @@ -121,7 +121,7 @@

      {{ record }}

      - + 

      {{ bind_export }}

      {{ bind_export }}
      diff --git a/netbox/templates/dns/zone.html b/netbox/templates/dns/zone.html index 317278c86d4..90a72ffce70 100644 --- a/netbox/templates/dns/zone.html +++ b/netbox/templates/dns/zone.html @@ -162,7 +162,7 @@

      {{ zone }}

      - + 

      {{ bind_export }}

      {{ bind_export }}
      diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 76c03b12996..df5f638bc61 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -117,7 +117,7 @@
      - BIND Reverse Exports + {{ bind_export_count }} BIND Reverse Exports
      {% for z in bind_export %} @@ -126,7 +126,7 @@ Select {% endfor %}
      - 

      {{ z.content }}

      + 
      {{ z.content }}
      @@ -138,15 +138,19 @@ +{% endblock %} From f225efa7c7e8ee9d6ed744f021ef8cc2bd2b83f6 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 27 Jul 2016 12:08:22 +0200 Subject: [PATCH 19/42] Improve records table on zone page --- netbox/dns/tables.py | 11 +++++++++ netbox/dns/views.py | 6 +++++ netbox/templates/dns/zone.html | 42 +++------------------------------- 3 files changed, 20 insertions(+), 39 deletions(-) diff --git a/netbox/dns/tables.py b/netbox/dns/tables.py index 8d01775845a..3444bc84cc6 100644 --- a/netbox/dns/tables.py +++ b/netbox/dns/tables.py @@ -49,4 +49,15 @@ class RecordBriefTable(BaseTable): class Meta(BaseTable.Meta): model=Record fields = ('name', 'record_type', 'priority', 'zone') + +class RecordZoneTable(BaseTable): + name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + record_type = tables.Column(verbose_name='Type') + priority = tables.Column(verbose_name='Priority') + address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') + value = tables.Column(verbose_name='Value') + + class Meta(BaseTable.Meta): + model=Record + fields = ('name', 'record_type', 'priority', 'address', 'value') \ No newline at end of file diff --git a/netbox/dns/views.py b/netbox/dns/views.py index 8b3c4bbf2fa..55aa0bf10c5 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -13,6 +13,7 @@ from . import filters, forms, tables from .models import Zone, Record +from .tables import RecordZoneTable # # Zones @@ -33,6 +34,10 @@ def zone(request, pk): record_count = len(records) bind_export = zone.to_bind(records) + # DNS records + dns_records = Record.objects.filter(zone=zone) + dns_records_table = RecordZoneTable(dns_records) + if request.GET.get('bind_export'): response = HttpResponse( bind_export, @@ -47,6 +52,7 @@ def zone(request, pk): 'zone': zone, 'records': records, 'record_count': record_count, + 'dns_records_table': dns_records_table, 'bind_export': bind_export, }) diff --git a/netbox/templates/dns/zone.html b/netbox/templates/dns/zone.html index 90a72ffce70..e85592a3405 100644 --- a/netbox/templates/dns/zone.html +++ b/netbox/templates/dns/zone.html @@ -112,45 +112,9 @@

      {{ zone }}

      -
      -
      - Records -
      - {% if records %} - - {% for r in records %} - - - - - - - {% endfor %} -
      - {{ r }} - {{ r.record_type }} - {% if r.priority %} - {{ r.priority }} - {% else %} - - - {% endif %} - - {% if r.address %} - {{ r.address }} - {% else %} - - - {% endif %} - - {% if r.value %} - {{ r.value }} - {% else %} - - - {% endif %} -
      - {% else %} -
      None
      - {% endif %} -
      + {% with heading='Records' %} + {% render_table dns_records_table 'panel_table.html' %} + {% endwith %}
      From c11cadec533d756977e474a5ed83394cc9920a64 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 27 Jul 2016 12:38:55 +0200 Subject: [PATCH 20/42] Make records searchable by ip address --- netbox/dns/filters.py | 8 ++++---- netbox/ipam/views.py | 1 - netbox/templates/dns/record_list.html | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/netbox/dns/filters.py b/netbox/dns/filters.py index 480aa956a2c..1c0c733898f 100644 --- a/netbox/dns/filters.py +++ b/netbox/dns/filters.py @@ -37,15 +37,15 @@ class RecordFilter(django_filters.FilterSet): lookup_type = 'icontains', label = 'Name', ) - name_or_value = django_filters.MethodFilter( - name = 'name_or_value', + name_or_value_or_ip = django_filters.MethodFilter( + name = 'name_or_value_or_ip', ) class Meta: model=Record field = ['name', 'record_type', 'value'] - def filter_name_or_value(self, queryset, value): + def filter_name_or_value_or_ip(self, queryset, value): if not value: return queryset - return queryset.filter(Q(name__icontains=value) | Q(value__icontains=value)) + return queryset.filter(Q(name__icontains=value) | Q(value__icontains=value) | Q(address__address__icontains=value)) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index cfc0d39c8de..4c64c5a7c13 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -423,7 +423,6 @@ def ipaddress(request, pk): dns_records = Record.objects.filter(address=ipaddress) dns_records_table = RecordBriefTable(dns_records) - return render(request, 'ipam/ipaddress.html', { 'ipaddress': ipaddress, 'parent_prefixes_table': parent_prefixes_table, diff --git a/netbox/templates/dns/record_list.html b/netbox/templates/dns/record_list.html index d642af2c07b..4f6b1e65bd8 100644 --- a/netbox/templates/dns/record_list.html +++ b/netbox/templates/dns/record_list.html @@ -31,7 +31,7 @@

      Records

      - +
      - + 
      {{ bind_export }}
      {{ bind_export }}
      diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 46d44636110..ba7e12da25b 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -80,6 +80,38 @@ IP Addresses {{ ipaddress_count }} + + Reverse DNS - TTL + {{ zone.ttl }} + + + Reverse DNS - SOA Name + {{ zone.soa_name }} + + + Reverse DNS - SOA Contact + {{ zone.soa_contact }} + + + Reverse DNS - SOA Serial + {{ zone.soa_serial }} + + + Reverse DNS - SOA Refresh + {{ zone.soa_refresh }} + + + Reverse DNS - SOA Retry + {{ zone.soa_retry }} + + + Reverse DNS - SOA Expire + {{ zone.soa_expire }} + + + Reverse DNS - SOA Minimum + {{ zone.soa_minimum }} + Created {{ prefix.created }} diff --git a/netbox/templates/ipam/prefix_bulk_edit.html b/netbox/templates/ipam/prefix_bulk_edit.html index 03e35872597..93844e2a5d0 100644 --- a/netbox/templates/ipam/prefix_bulk_edit.html +++ b/netbox/templates/ipam/prefix_bulk_edit.html @@ -12,6 +12,14 @@ {{ prefix.status }} {{ prefix.role }} {{ prefix.description }} + {{ prefix.ttl }} + {{ prefix.soa_name }} + {{ prefix.soa_contact }} + {{ prefix.soa_refresh }} + {{ prefix.soa_retry }} + {{ prefix.soa_expire }} + {{ prefix.soa_minimum }} + {{ prefix.description }} {% endfor %} {% endblock %} diff --git a/netbox/templates/ipam/prefix_import.html b/netbox/templates/ipam/prefix_import.html index 902f23443a8..03dc3f7f2fd 100644 --- a/netbox/templates/ipam/prefix_import.html +++ b/netbox/templates/ipam/prefix_import.html @@ -68,10 +68,45 @@

      CSV Format

      Short description (optional) 7th floor WiFi + + Reverse DNS - TTL + Time to live, in seconds + 10800 + + + Reverse DNS - SOA Name + The primary name server for the domain, @ for origin + @ + + + Reverse DNS - SOA Contact + The responsible party for the domain + ns.foo.net. noc.foo.net. + + + Reverse DNS - SOA Refresh + Refresh time, in seconds + 3600 + + + Reverse DNS - SOA Retry + Retry time, in seconds + 3600 + + + Reverse DNS - SOA Expire + Expire time, in seconds + 604800 + + + Reverse DNS - SOA Minimum + Negative result TTL, in seconds + 1800 +

      Example

      - 
      192.168.42.0/24,65000:123,HQ,Customers,801,Active,Customer,7th floor WiFi
      + 
      192.168.42.0/24,65000:123,HQ,Customers,801,Active,Customer,7th floor WiFi,10800,@,ns.foo.net. noc.foo.net.,3600,3600,604800,1800
      {% endblock %} From ee78bf545598101b36648d4f66aa0531fb84595d Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 27 Jul 2016 15:10:28 +0200 Subject: [PATCH 22/42] Rename field in IPAddr : "hostname" to "ptr" --- netbox/ipam/forms.py | 8 +++---- .../migrations/0008_auto_20160727_1307.py | 24 +++++++++++++++++++ netbox/ipam/models.py | 14 +++++------ netbox/ipam/tables.py | 4 ++-- netbox/templates/ipam/ipaddress.html | 6 ++--- .../templates/ipam/ipaddress_bulk_edit.html | 2 +- netbox/templates/ipam/ipaddress_edit.html | 2 +- netbox/templates/ipam/ipaddress_import.html | 4 ++-- 8 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 netbox/ipam/migrations/0008_auto_20160727_1307.py diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index a33e68362ce..a3a73f32dfb 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -335,11 +335,11 @@ class IPAddressForm(forms.ModelForm, BootstrapMixin): class Meta: model = IPAddress - fields = ['address', 'vrf', 'hostname', 'nat_device', 'nat_inside', 'description'] + fields = ['address', 'vrf', 'ptr', 'nat_device', 'nat_inside', 'description'] help_texts = { 'address': "IPv4 or IPv6 address and mask", 'vrf': "VRF (if applicable)", - 'hostname': "Reverse DNS host name", + 'ptr': "Reverse DNS name", } def __init__(self, *args, **kwargs): @@ -392,7 +392,7 @@ class IPAddressFromCSVForm(forms.ModelForm): class Meta: model = IPAddress - fields = ['address', 'vrf', 'hostname', 'device', 'interface_name', 'is_primary', 'description'] + fields = ['address', 'vrf', 'ptr', 'device', 'interface_name', 'is_primary', 'description'] def clean(self): @@ -439,7 +439,7 @@ class IPAddressBulkEditForm(forms.Form, BootstrapMixin): pk = forms.ModelMultipleChoiceField(queryset=IPAddress.objects.all(), widget=forms.MultipleHiddenInput) vrf = forms.ModelChoiceField(queryset=VRF.objects.all(), required=False, label='VRF', help_text="Select the VRF to assign, or check below to remove VRF assignment") - hostname = forms.CharField(max_length=100, required=False) + ptr = forms.CharField(max_length=100, required=False, label='PTR') vrf_global = forms.BooleanField(required=False, label='Set VRF to global') description = forms.CharField(max_length=50, required=False) diff --git a/netbox/ipam/migrations/0008_auto_20160727_1307.py b/netbox/ipam/migrations/0008_auto_20160727_1307.py new file mode 100644 index 00000000000..2d3f88dbf67 --- /dev/null +++ b/netbox/ipam/migrations/0008_auto_20160727_1307.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-27 13:07 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0007_auto_20160722_0958'), + ] + + operations = [ + migrations.RemoveField( + model_name='ipaddress', + name='hostname', + ), + migrations.AddField( + model_name='ipaddress', + name='ptr', + field=models.CharField(blank=True, max_length=100, verbose_name=b'PTR'), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index e407ebf00fd..1d518ffb807 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -376,7 +376,7 @@ def header (zone_id): return '\n'.join([ ipaddresses = IPAddress.objects.filter(family=4) for ip in ipaddresses: - if ip.hostname: + if ip.ptr: ibytes = str(ip.address).split('/')[0].split('.') islash = str(ip.address).split('/')[1] i = netaddr.IPAddress(unicode('.'.join(ibytes))) @@ -386,12 +386,12 @@ def header (zone_id): return '\n'.join([ zone_id = ibytes[2] + '.' + ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.' if not zone_id in zones: zones[zone_id] = header(zone_id) - zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' else: zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' if not zone_id in zones: zones[zone_id] = header(zone_id) - zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' @@ -416,7 +416,7 @@ def header (zone_id): return '\n'.join([ pnibbles = pnibbles[:zslash/16] + ['0000'] * (8 - zslash/16) for ip in ipaddresses: - if ip.hostname: + if ip.ptr: ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) inibbles = ifull.split(':') idigits = ifull.replace(':','')[::-1] @@ -427,7 +427,7 @@ def header (zone_id): return '\n'.join([ if not zone_id in zones: zones[zone_id] = header(zone_id) - zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' for z in zones: @@ -459,7 +459,7 @@ class IPAddress(CreatedUpdatedModel): address = IPAddressField() vrf = models.ForeignKey('VRF', related_name='ip_addresses', on_delete=models.PROTECT, blank=True, null=True, verbose_name='VRF') - hostname = models.CharField(max_length=100, blank=True, verbose_name='Host Name') + ptr = models.CharField(max_length=100, blank=True, verbose_name='PTR') interface = models.ForeignKey(Interface, related_name='ip_addresses', on_delete=models.CASCADE, blank=True, null=True) nat_inside = models.OneToOneField('self', related_name='nat_outside', on_delete=models.SET_NULL, blank=True, @@ -513,7 +513,7 @@ def to_csv(self): return ','.join([ str(self.address), self.vrf.rd if self.vrf else '', - self.hostname if self.hostname else '', + self.ptr if self.ptr else '', self.device.identifier if self.device else '', self.interface.name if self.interface else '', 'True' if is_primary else '', diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 83d062ec98b..5048e3ee5a8 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -160,7 +160,7 @@ class IPAddressTable(BaseTable): pk = ToggleColumn() address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('pk')], verbose_name='IP Address') vrf = tables.Column(orderable=False, default='Global', verbose_name='VRF') - hostname = tables.Column(verbose_name='Host Name') + ptr = tables.Column(verbose_name='PTR') device = tables.LinkColumn('dcim:device', args=[Accessor('interface.device.pk')], orderable=False, verbose_name='Device') interface = tables.Column(orderable=False, verbose_name='Interface') @@ -168,7 +168,7 @@ class IPAddressTable(BaseTable): class Meta(BaseTable.Meta): model = IPAddress - fields = ('pk', 'address', 'vrf', 'hostname', 'device', 'interface', 'description') + fields = ('pk', 'address', 'vrf', 'ptr', 'device', 'interface', 'description') class IPAddressBriefTable(BaseTable): diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index ea008bca72b..400d80cc9d4 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -65,10 +65,10 @@

      {{ ipaddress }}

      - Host Name + PTR - {% if ipaddress.hostname %} - {{ ipaddress.hostname }} + {% if ipaddress.ptr %} + {{ ipaddress.ptr }} {% else %} None {% endif %} diff --git a/netbox/templates/ipam/ipaddress_bulk_edit.html b/netbox/templates/ipam/ipaddress_bulk_edit.html index cf52a3b0663..85e9e948848 100644 --- a/netbox/templates/ipam/ipaddress_bulk_edit.html +++ b/netbox/templates/ipam/ipaddress_bulk_edit.html @@ -8,7 +8,7 @@ {{ ipaddress }} {{ ipaddress.vrf }} - {{ ipaddress.hostname }} + {{ ipaddress.ptr }} {{ ipaddress.interface.device }} {{ ipaddress.interface }} {{ ipaddress.description }} diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html index e2b0dec02b5..d7958a2ba2b 100644 --- a/netbox/templates/ipam/ipaddress_edit.html +++ b/netbox/templates/ipam/ipaddress_edit.html @@ -8,7 +8,7 @@
      {% render_field form.address %} {% render_field form.vrf %} - {% render_field form.hostname %} + {% render_field form.ptr %} {% if obj %}
      diff --git a/netbox/templates/ipam/ipaddress_import.html b/netbox/templates/ipam/ipaddress_import.html index 76906d683f6..a890798a59e 100644 --- a/netbox/templates/ipam/ipaddress_import.html +++ b/netbox/templates/ipam/ipaddress_import.html @@ -39,8 +39,8 @@

      CSV Format

      65000:123 - Host Name - Reverse DNS host name + PTR + Reverse DNS Name foo.com From ff5d7707668ee9727db84d58e4408b7e1805379e Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 27 Jul 2016 16:09:38 +0200 Subject: [PATCH 23/42] Add auto A/AAAA creating when ptr modified & fix bug w/ prefix serial --- netbox/ipam/models.py | 26 ++++++++++++++++++++++++++ netbox/ipam/views.py | 11 +++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 1d518ffb807..988332de2d0 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -493,6 +493,7 @@ def clean(self): raise ValidationError("Duplicate IP address found in global table: {}".format(duplicate_ips.first())) def save(self, *args, **kwargs): + self.update_dns() if self.address: # Infer address family from IPAddress object self.family = self.address.version @@ -501,6 +502,31 @@ def save(self, *args, **kwargs): r.save() super(IPAddress, self).save(*args, **kwargs) + def update_dns(self): + """Auto-create a corresponding A/AAAA DNS record (if possible) whenever the PTR field is modified""" + if self.ptr: + which_zone = None + zones = dns.models.Zone.objects.all() + for zone in zones: + if self.ptr.endswith(zone.name): + which_zone = zone + break + + if which_zone: + zone_name = which_zone.name + record_name = self.ptr[:-len(zone_name)] + if record_name.endswith('.'): + record_name = record_name[:-1] + record_type = 'A' if self.family==4 else 'AAAA' + + dns.models.Record.objects.get_or_create( + name = record_name, + record_type = record_type, + zone = which_zone, + address = self, + description = 'gen by netbox' + ) + def to_csv(self): # Determine if this IP is primary for a Device diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 4c64c5a7c13..84ff20c19d1 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -354,11 +354,14 @@ def update_objects(self, pk_list, form): fields_to_update['vrf'] = form.cleaned_data['vrf'] elif form.cleaned_data['vrf_global']: fields_to_update['vrf'] = None - for field in ['site', 'status', 'role', 'description']: + for field in ['site', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum']: if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] - return self.cls.objects.filter(pk__in=pk_list).update(**fields_to_update) + plist = self.cls.objects.filter(pk__in=pk_list) + for p in plist: + p.save() + return plist.update(**fields_to_update) class PrefixBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): @@ -484,13 +487,13 @@ def update_objects(self, pk_list, form): fields_to_update['vrf'] = form.cleaned_data['vrf'] elif form.cleaned_data['vrf_global']: fields_to_update['vrf'] = None - for field in ['description']: + for field in ['ptr', 'description']: if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] iplist = self.cls.objects.filter(pk__in=pk_list) for ip in iplist: - ip.save() # in order to update dns zones serials + ip.save() return iplist.update(**fields_to_update) From 1443bfde46c8c5b10378169ddaf188dfd4d9dc97 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 10:30:43 +0200 Subject: [PATCH 24/42] Auto-create missing IPs on record creating/editing/importing --- netbox/dns/formfields.py | 41 ++++++++++++++++++++++++++++++++++++++++ netbox/dns/forms.py | 9 +++++++-- netbox/ipam/models.py | 3 +-- 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 netbox/dns/formfields.py diff --git a/netbox/dns/formfields.py b/netbox/dns/formfields.py new file mode 100644 index 00000000000..6c1049f6559 --- /dev/null +++ b/netbox/dns/formfields.py @@ -0,0 +1,41 @@ +from netaddr import IPNetwork, AddrFormatError +import netaddr + +from django import forms +from django.core.exceptions import ValidationError + +from ipam.models import IPAddress, Prefix + + +# +# Form fields +# + +class AddressFormField(forms.Field): + default_error_messages = { + 'invalid': "Enter a valid IPv4 or IPv6 address (with CIDR mask).", + } + + def to_python(self, value): + if not value: + return None + + # Ensure that a subnet mask has been specified. This prevents IPs from defaulting to a /32 or /128. + if len(value.split('/')) != 2: + raise ValidationError('CIDR mask (e.g. /24) is required.') + + try: + net = IPNetwork(value) + except AddrFormatError: + raise ValidationError("Please specify a valid IPv4 or IPv6 address.") + + ip = IPAddress.objects.filter(address=value) + if not ip: + net = IPNetwork(value) + obj = IPAddress(address=net) + obj.save() + return obj + else: + return ip[0] + + diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py index f2f0df61701..94f3d3ffea9 100644 --- a/netbox/dns/forms.py +++ b/netbox/dns/forms.py @@ -11,6 +11,8 @@ Record, ) +from .formfields import AddressFormField + # # Zones # @@ -73,6 +75,8 @@ class ZoneFilterForm(forms.Form, BootstrapMixin): class RecordForm(forms.ModelForm, BootstrapMixin): + address = AddressFormField(required=False) + class Meta: model=Record fields = ['name', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] @@ -88,10 +92,11 @@ class Meta: 'value': 'Text value else, in CNAME records for instance' } + class RecordFromCSVForm(forms.ModelForm): zone = forms.ModelChoiceField(queryset=Zone.objects.all(), to_field_name='name', error_messages={'invalid_choice': 'Zone not found.'}) - address = forms.ModelChoiceField(queryset=IPAddress.objects.all(), to_field_name='address', error_messages={'invalid_choice': 'IP Address not found.'}, required=False) + address = AddressFormField(required=False) class Meta: model=Record @@ -114,7 +119,7 @@ class RecordBulkEditForm(forms.Form, BootstrapMixin): record_type = forms.CharField(max_length=100, required=False, label='Type') priority = forms.IntegerField(required=False) zone = forms.ModelChoiceField(queryset=Zone.objects.all(), required=False) - address = forms.ModelChoiceField(queryset=IPAddress.objects.all(), required=False) + address = AddressFormField(required=False) value = forms.CharField(max_length=100, required=False) class RecordBulkDeleteForm(ConfirmationForm): diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 988332de2d0..c4a731ad50c 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -523,8 +523,7 @@ def update_dns(self): name = record_name, record_type = record_type, zone = which_zone, - address = self, - description = 'gen by netbox' + address = self ) def to_csv(self): From f462d0c6ee3482eace1acdd553fe03c00f4cc1ee Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 11:04:44 +0200 Subject: [PATCH 25/42] Fix problem with serials Make them auto-update only on export if changes and not on every modification in the (reverse) zone --- .../dns/migrations/0005_auto_20160728_0854.py | 25 +++++++++++++++++++ netbox/dns/models.py | 23 +++++++++++++---- netbox/dns/views.py | 2 +- .../migrations/0009_auto_20160728_0854.py | 25 +++++++++++++++++++ netbox/ipam/models.py | 23 +++++++++++++---- netbox/ipam/views.py | 2 +- 6 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 netbox/dns/migrations/0005_auto_20160728_0854.py create mode 100644 netbox/ipam/migrations/0009_auto_20160728_0854.py diff --git a/netbox/dns/migrations/0005_auto_20160728_0854.py b/netbox/dns/migrations/0005_auto_20160728_0854.py new file mode 100644 index 00000000000..2138a6b381b --- /dev/null +++ b/netbox/dns/migrations/0005_auto_20160728_0854.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-28 08:54 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dns', '0004_auto_20160722_0820'), + ] + + operations = [ + migrations.AddField( + model_name='zone', + name='bind_changed', + field=models.BooleanField(default=True), + ), + migrations.AlterField( + model_name='zone', + name='soa_serial', + field=models.CharField(max_length=10), + ), + ] diff --git a/netbox/dns/models.py b/netbox/dns/models.py index dff771c1d7f..df4cd381545 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -20,7 +20,10 @@ class Zone(CreatedUpdatedModel): ttl = models.PositiveIntegerField() soa_name = models.CharField(max_length=100) soa_contact = models.CharField(max_length=100) - soa_serial = models.CharField(max_length=100) + + soa_serial = models.CharField(max_length=10) + bind_changed = models.BooleanField(default=True) + soa_refresh = models.PositiveIntegerField() soa_retry = models.PositiveIntegerField() soa_expire = models.PositiveIntegerField() @@ -37,26 +40,34 @@ def get_absolute_url(self): return reverse('dns:zone', args=[self.pk]) def save(self, *args, **kwargs): - self.update_serial() + self.bind_changed = True super(Zone, self).save(*args, **kwargs) + def set_bind_changed(self, value): + self.bind_changed = value + super(Zone, self).save() + def update_serial(self): """ Each time a record or the zone is modified, the serial is incremented. """ current_date = time.strftime('%Y%m%d',time.localtime()) if not self.soa_serial: - self.soa_serial = current_date+'1' + self.soa_serial = current_date+'01' else: serial_date = self.soa_serial[:8] serial_num = self.soa_serial[8:] if serial_date!=current_date: - self.soa_serial = current_date+'1' + self.soa_serial = current_date+'01' else: serial_num = int(serial_num) serial_num += 1 - self.soa_serial = current_date + str(serial_num) + if serial_num<10: + self.soa_serial = current_date + '0' + str(serial_num) + else: + self.soa_serial = current_date + str(serial_num) + self.set_bind_changed(False) def to_csv(self): @@ -74,6 +85,8 @@ def to_csv(self): ]) def to_bind(self,records): + if self.bind_changed: + self.update_serial() bind_records = '' for r in records: bind_records += r.to_bind()+'\n' diff --git a/netbox/dns/views.py b/netbox/dns/views.py index 55aa0bf10c5..ca4442ee18a 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -91,7 +91,7 @@ def update_objects(self, pk_list, form): zlist = self.cls.objects.filter(pk__in=pk_list) for z in zlist: - z.save() + z.set_bind_changed(True) return zlist.update(**fields_to_update) diff --git a/netbox/ipam/migrations/0009_auto_20160728_0854.py b/netbox/ipam/migrations/0009_auto_20160728_0854.py new file mode 100644 index 00000000000..218c95989db --- /dev/null +++ b/netbox/ipam/migrations/0009_auto_20160728_0854.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-28 08:54 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0008_auto_20160727_1307'), + ] + + operations = [ + migrations.AddField( + model_name='prefix', + name='bind_changed', + field=models.BooleanField(default=True), + ), + migrations.AlterField( + model_name='prefix', + name='soa_serial', + field=models.CharField(blank=True, max_length=10), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index c4a731ad50c..0557bd628df 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -244,7 +244,10 @@ class Prefix(CreatedUpdatedModel): ttl = models.PositiveIntegerField(blank=True, null=True) soa_name = models.CharField(max_length=100, blank=True) soa_contact = models.CharField(max_length=100, blank=True) - soa_serial = models.CharField(max_length=100, blank=True) + + soa_serial = models.CharField(max_length=10, blank=True) + bind_changed = models.BooleanField(default=True) + soa_refresh = models.PositiveIntegerField(blank=True, null=True) soa_retry = models.PositiveIntegerField(blank=True, null=True) soa_expire = models.PositiveIntegerField(blank=True, null=True) @@ -272,7 +275,7 @@ def clean(self): "instead.") def save(self, *args, **kwargs): - self.update_serial() + self.bind_changed = True if self.prefix: # Clear host bits from prefix self.prefix = self.prefix.cidr @@ -280,23 +283,31 @@ def save(self, *args, **kwargs): self.family = self.prefix.version super(Prefix, self).save(*args, **kwargs) + def set_bind_changed(self, value): + self.bind_changed = value + super(Prefix, self).save() + def update_serial(self): """ Each time a record or the zone is modified, the serial is incremented. """ current_date = time.strftime('%Y%m%d',time.localtime()) if not self.soa_serial: - self.soa_serial = current_date+'1' + self.soa_serial = current_date+'01' else: serial_date = self.soa_serial[:8] serial_num = self.soa_serial[8:] if serial_date!=current_date: - self.soa_serial = current_date+'1' + self.soa_serial = current_date+'01' else: serial_num = int(serial_num) serial_num += 1 - self.soa_serial = current_date + str(serial_num) + if serial_num < 10: + self.soa_serial = current_date + '0' + str(serial_num) + else: + self.soa_serial = current_date + str(serial_num) + self.set_bind_changed(False) def to_csv(self): return ','.join([ @@ -331,6 +342,8 @@ def get_status_class(self): return STATUS_CHOICE_CLASSES[self.status] def to_bind(self,ipaddresses): + if self.bind_changed: + self.update_serial() zones = {} diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 84ff20c19d1..e7ecf0ba661 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -360,7 +360,7 @@ def update_objects(self, pk_list, form): plist = self.cls.objects.filter(pk__in=pk_list) for p in plist: - p.save() + p.set_bind_changed(True) return plist.update(**fields_to_update) From 955910b97b7fa73595b10d2a1ca5058797b701df Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 11:05:44 +0200 Subject: [PATCH 26/42] Fix bug on reverse DNS fields on prefix page Fix non-displaying --- netbox/templates/ipam/prefix.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index ba7e12da25b..7e894a5c0a3 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -82,35 +82,35 @@ Reverse DNS - TTL - {{ zone.ttl }} + {{ prefix.ttl }} Reverse DNS - SOA Name - {{ zone.soa_name }} + {{ prefix.soa_name }} Reverse DNS - SOA Contact - {{ zone.soa_contact }} + {{ prefix.soa_contact }} Reverse DNS - SOA Serial - {{ zone.soa_serial }} + {{ prefix.soa_serial }} Reverse DNS - SOA Refresh - {{ zone.soa_refresh }} + {{ prefix.soa_refresh }} Reverse DNS - SOA Retry - {{ zone.soa_retry }} + {{ prefix.soa_retry }} Reverse DNS - SOA Expire - {{ zone.soa_expire }} + {{ prefix.soa_expire }} Reverse DNS - SOA Minimum - {{ zone.soa_minimum }} + {{ prefix.soa_minimum }} Created From 4080c16dd34f2e8d48a4115700fde092ca367e24 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 12:38:49 +0200 Subject: [PATCH 27/42] Move bind exports to specific views with download links --- netbox/dns/urls.py | 5 +- netbox/dns/views.py | 82 +++++++++++++------ netbox/ipam/views.py | 6 -- netbox/templates/_base.html | 3 +- .../{full_reverse.html => bind_export.html} | 22 ++++- netbox/templates/dns/zone.html | 36 -------- netbox/templates/ipam/prefix.html | 44 +--------- 7 files changed, 84 insertions(+), 114 deletions(-) rename netbox/templates/dns/{full_reverse.html => bind_export.html} (65%) diff --git a/netbox/dns/urls.py b/netbox/dns/urls.py index f836bc831b5..98e38fcc840 100644 --- a/netbox/dns/urls.py +++ b/netbox/dns/urls.py @@ -24,7 +24,8 @@ url(r'^records/(?P\d+)/edit/$', views.RecordEditView.as_view(), name='record_edit'), url(r'^records/(?P\d+)/delete/$', views.RecordDeleteView.as_view(), name='record_delete'), - # Full Reverse - url(r'^reverse/$', views.full_reverse, name='full_reverse'), + # BIND Exports + url(r'^bind/forward/$', views.full_forward, name='full_forward'), + url(r'^bind/reverse/$', views.full_reverse, name='full_reverse'), ] diff --git a/netbox/dns/views.py b/netbox/dns/views.py index ca4442ee18a..f1e79b09263 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -15,6 +15,8 @@ from .models import Zone, Record from .tables import RecordZoneTable +import StringIO, zipfile, time + # # Zones # @@ -32,29 +34,17 @@ def zone(request, pk): zone = get_object_or_404(Zone.objects.all(), pk=pk) records = Record.objects.filter(zone=zone) record_count = len(records) - bind_export = zone.to_bind(records) # DNS records dns_records = Record.objects.filter(zone=zone) dns_records_table = RecordZoneTable(dns_records) - if request.GET.get('bind_export'): - response = HttpResponse( - bind_export, - content_type='text/plain' - ) - response['Content-Disposition'] = 'attachment; filename="netbox_{}.txt"'\ - .format(zone.name) - return response - - else: - return render(request, 'dns/zone.html', { - 'zone': zone, - 'records': records, - 'record_count': record_count, - 'dns_records_table': dns_records_table, - 'bind_export': bind_export, - }) + return render(request, 'dns/zone.html', { + 'zone': zone, + 'records': records, + 'record_count': record_count, + 'dns_records_table': dns_records_table, + }) class ZoneEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dns.change_zone' @@ -167,9 +157,57 @@ class RecordBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): default_redirect_url = 'dns:record_list' # -# Full Reverse +# BIND Exports # +def bind_export(request, zones_list, context): + download = request.GET.get('download') + if download: + if download == 'all': + zbuf = StringIO.StringIO() + zfile = zipfile.ZipFile(zbuf, mode='w') + temp = [] + for z in zones_list: + temp.append(StringIO.StringIO()) + temp[len(temp)-1].write(z['content']) + zfile.writestr(z['id'],str(temp[len(temp)-1].getvalue())) + zfile.close() + response = HttpResponse( + zbuf.getvalue(), + content_type = 'application/zip' + ) + response['Content-Disposition'] = 'attachment; filename="netbox_dns_{}_{}.zip"'.format(context, str(int(time.time()))) + return response + else: + response = HttpResponse( + zones_list[int(download)]['content'], + content_type='text/plain' + ) + response['Content-Disposition'] = 'attachment; filename="{}"'.format(zones_list[int(download)]['id']) + return response + + else: + return render(request, 'dns/bind_export.html', { + 'context': context[0].upper() + context[1:], + 'zones': zones_list, + 'bind_export_count': len(zones_list), + }) + +def full_forward(request): + + zones = Zone.objects.all() + + zones_list = [] + for z in zones: + records = Record.objects.filter(zone=z) + zones_list.append({ + 'num': len(zones_list), + 'id': z.name, + 'content': z.to_bind(records) + }) + + return bind_export(request, zones_list, 'forward') + def full_reverse(request): zones = {} @@ -191,7 +229,5 @@ def full_reverse(request): 'content': zc, }) - return render(request, 'dns/full_reverse.html', { - 'zones': zones_list, - 'bind_export_count': len(zones_list), - }) + return bind_export(request, zones_list, 'reverse') + diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index e7ecf0ba661..9a23ac16e81 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -281,10 +281,6 @@ def prefix(request, pk): # Count child IP addresses ipaddress_count = child_ip.count() - # BIND reverse export - bind_export = prefix.to_bind(child_ip) - bind_export_count = len(bind_export) - # Parent prefixes table parent_prefixes = Prefix.objects.filter(vrf=prefix.vrf, prefix__net_contains=str(prefix.prefix))\ .select_related('site', 'role').annotate_depth() @@ -313,8 +309,6 @@ def prefix(request, pk): 'parent_prefix_table': parent_prefix_table, 'child_prefix_table': child_prefix_table, 'duplicate_prefix_table': duplicate_prefix_table, - 'bind_export': bind_export, - 'bind_export_count': bind_export_count, }) diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html index e4c976e1fd2..581cdf031c7 100644 --- a/netbox/templates/_base.html +++ b/netbox/templates/_base.html @@ -171,7 +171,8 @@
    • Import zones
      • {% endif %}
    • -
    • Full Reverse Export
      • +
    • BIND Export Forward
      • +
    • BIND Export Reverse

  • diff --git a/netbox/templates/dns/full_reverse.html b/netbox/templates/dns/bind_export.html similarity index 65% rename from netbox/templates/dns/full_reverse.html rename to netbox/templates/dns/bind_export.html index a72ad06f51a..7794c7c0e43 100644 --- a/netbox/templates/dns/full_reverse.html +++ b/netbox/templates/dns/bind_export.html @@ -1,17 +1,33 @@ {% extends '_base.html' %} {% load render_table from django_tables2 %} -{% block title %}Full Reverse DNS{% endblock %} +{% block title %}BIND Export {{context}}{% endblock %} {% block content %} -

    Full Reverse DNS

    +
    +
    + + + Download ZIP + +
    +
    +
    +
    +

    BIND Export {{context}}

    +
    +
    {% for z in zones %}
    {{ z.id }} - Select + + Download + - + Select +
    + + + + diff --git a/netbox/templates/ipam/prefix_bulk_edit.html b/netbox/templates/ipam/prefix_bulk_edit.html index f76a6a1d5af..5f6f6eb1d2d 100644 --- a/netbox/templates/ipam/prefix_bulk_edit.html +++ b/netbox/templates/ipam/prefix_bulk_edit.html @@ -21,6 +21,7 @@ + {% endfor %} {% endblock %} diff --git a/netbox/templates/ipam/prefix_import.html b/netbox/templates/ipam/prefix_import.html index 37b3f390238..ba028bba1a6 100644 --- a/netbox/templates/ipam/prefix_import.html +++ b/netbox/templates/ipam/prefix_import.html @@ -108,10 +108,15 @@

    CSV Format

    + + + + +
    diff --git a/netbox/templates/dns/zone.html b/netbox/templates/dns/zone.html index c9a76f136c2..457b0eee428 100644 --- a/netbox/templates/dns/zone.html +++ b/netbox/templates/dns/zone.html @@ -25,10 +25,6 @@
    - - - BIND Export - {% if perms.dns.change_zone %} @@ -117,36 +113,4 @@

    {{ zone }}

    {% endwith %}
    -
    -
    -
    -
    - BIND Export - Select -
    - - - - - 
    {{ bind_export }}
    -
    -
    -
    -{% endblock %} -{% block javascript %} - {% endblock %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 7e894a5c0a3..915e2432659 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -145,47 +145,5 @@ {% endif %} -
    -
    -
    -
    - BIND Reverse Exports -
    - - {% for z in bind_export %} - - - {% endfor %} -
    - {{ z.id }} - Select -
    - 
    {{ z.content }}
    -
    -
    -
    -
    -{% endblock %} -{% block javascript %} - {% endblock %} + From bcdb192d28630e4007564cd4d547b8ab23963957 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 12:43:47 +0200 Subject: [PATCH 28/42] Put circuits panel into dcim column on home page --- netbox/templates/home.html | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/netbox/templates/home.html b/netbox/templates/home.html index 67b6bfab847..18c345c3bd8 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -93,6 +93,23 @@

    Se {% endif %} +
    +
    + Circuits +
    +
    +
    + {{ stats.provider_count }} +

    Providers

    +

    Organizations which provide circuit connectivity

    +
    +
    + {{ stats.circuit_count }} +

    Circuits

    +

    Communication links for Internet transit, peering, and other services

    +
    +
    +
    @@ -139,23 +156,6 @@

    Record

    -
    -
    - Circuits -
    -
    -
    - {{ stats.provider_count }} -

    Providers

    -

    Organizations which provide circuit connectivity

    -
    -
    - {{ stats.circuit_count }} -

    Circuits

    -

    Communication links for Internet transit, peering, and other services

    -
    -
    -
    From 107d898c3f4c33e2c98980c972f3ad198f45c19a Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 12:47:23 +0200 Subject: [PATCH 29/42] Adjust home page spacings (due to putting circuits into dcim column) --- netbox/project-static/css/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 13f4e14554a..b48bbb7a57d 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -9,7 +9,7 @@ html, body { height: 100%; } body { - padding-top: 70px; + padding-top: 60px; } .container { width: auto; @@ -19,7 +19,7 @@ body { min-height: 100%; height: auto !important; margin: 0 auto -61px; /* the bottom margin is the negative value of the footer's height */ - padding-bottom: 30px; + padding-bottom: 5px; } .footer, .push { height: 60px; /* .push must be the same height as .footer */ From ec36cba0292dbc73731f35d1049b7980997f30d4 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 12:51:44 +0200 Subject: [PATCH 30/42] Add export views links to dns panel on home page --- netbox/templates/home.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/netbox/templates/home.html b/netbox/templates/home.html index 18c345c3bd8..ba7bf196243 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -144,6 +144,14 @@

    VLANsDNS

    +
    +

    Export Forward

    +

    Export forward zones into Bind format

    +
    +
    +

    Export Reverse

    +

    Export reverse zones into Bind format

    +
    {{ stats.zone_count }}

    Zones

    From 033a54aa0a67c5970e70673863881cffc7b23042 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 15:23:04 +0200 Subject: [PATCH 31/42] Update APIs (ipam & dns) --- netbox/dns/api/serializers.py | 18 ++---------- netbox/dns/api/urls.py | 4 +++ netbox/dns/api/views.py | 27 ++++++++++++++++- netbox/dns/models.py | 42 +++++++++++++++++++++++++++ netbox/dns/views.py | 38 ++---------------------- netbox/ipam/api/serializers.py | 4 +-- netbox/templates/dns/bind_export.html | 6 ++-- 7 files changed, 82 insertions(+), 57 deletions(-) diff --git a/netbox/dns/api/serializers.py b/netbox/dns/api/serializers.py index 00cd0f42462..ba7286a1cf1 100644 --- a/netbox/dns/api/serializers.py +++ b/netbox/dns/api/serializers.py @@ -9,18 +9,10 @@ class ZoneSerializer(serializers.ModelSerializer): - bind_export = serializers.SerializerMethodField() - class Meta: model=Zone fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] - def get_bind_export(self, obj): - records = Record.objects.filter(zone=obj) - return { - 'export': obj.to_bind(records), - } - class ZoneNestedSerializer(ZoneSerializer): class Meta(ZoneSerializer.Meta): @@ -35,18 +27,12 @@ class RecordSerializer(serializers.ModelSerializer): zone = ZoneNestedSerializer() address = IPAddressNestedSerializer() - bind_export = serializers.SerializerMethodField() class Meta: model=Record - fields = ['id', 'name', 'category', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] - - def get_bind_export(self, obj): - return { - 'export': obj.to_bind(), - } + fields = ['id', 'name', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] class RecordNestedSerializer(RecordSerializer): class Meta(RecordSerializer.Meta): - fields = ['id', 'name', 'record_type', 'zone'] \ No newline at end of file + fields = ['id', 'name', 'record_type', 'zone'] diff --git a/netbox/dns/api/urls.py b/netbox/dns/api/urls.py index 2d6c622a3cc..75a9c184d1b 100644 --- a/netbox/dns/api/urls.py +++ b/netbox/dns/api/urls.py @@ -12,4 +12,8 @@ url(r'^records/$', RecordListView.as_view(), name='record_list'), url(r'^records/(?P\d+)/$', RecordDetailView.as_view(), name='record_detail'), + # BIND Exports + url(r'^bind/forward/$', bind_forward, name='bind_forward'), + url(r'^bind/reverse/$', bind_reverse, name='bind_reverse'), + ] diff --git a/netbox/dns/api/views.py b/netbox/dns/api/views.py index 8b304694e68..480e5772915 100644 --- a/netbox/dns/api/views.py +++ b/netbox/dns/api/views.py @@ -1,7 +1,11 @@ from rest_framework import generics +from django.http import HttpResponse + +from rest_framework.decorators import api_view +from rest_framework.response import Response from ipam.models import IPAddress -from dns.models import Zone, Record +from dns.models import Zone, Record, export_bind_forward, export_bind_reverse from dns import filters from . import serializers @@ -42,3 +46,24 @@ class RecordDetailView(generics.RetrieveAPIView): """ queryset = Record.objects.all() serializer_class = serializers.RecordSerializer + +# +# BIND Exports +# + +@api_view(['GET']) +def bind_forward(request): + """ + Full export of forward zones in BIND format + """ + zones_list = export_bind_forward() + return Response(zones_list) + +@api_view(['GET']) +def bind_reverse(request): + """ + Full export of reverse zones in BIND format + """ + zones_list = export_bind_reverse() + return Response(zones_list) + diff --git a/netbox/dns/models.py b/netbox/dns/models.py index df4cd381545..d4b73003b44 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -12,6 +12,8 @@ from django.db.models.signals import pre_delete from django.dispatch import receiver +import ipam.models + class Zone(CreatedUpdatedModel): """ A Zone represents a DNS zone. It contains SOA data but no records, records are represented as Record objects. @@ -169,4 +171,44 @@ def to_bind(self): def on_record_delete(sender, **kwargs): kwargs['instance'].zone.save() +# +# BIND Exports +# + +def export_bind_forward(): + zones = Zone.objects.all() + + zones_list = [] + for z in zones: + records = Record.objects.filter(zone=z) + zones_list.append({ + 'num': len(zones_list), + 'id': z.name, + 'content': z.to_bind(records) + }) + + return zones_list + +def export_bind_reverse(): + zones = {} + + prefixes = ipam.models.Prefix.objects.all() + + for p in prefixes: + child_ip = ipam.models.IPAddress.objects.filter(address__net_contained_or_equal=str(p.prefix)) + z = p.to_bind(child_ip) + for zz in z: + if not zz['id'] in zones: + zones[zz['id']] = zz['content'] + + zones_list = [] + for zid,zc in zones.items(): + zones_list.append({ + 'num': len(zones_list), + 'id': zid, + 'content': zc, + }) + + return zones_list + diff --git a/netbox/dns/views.py b/netbox/dns/views.py index f1e79b09263..b8f3ad0d9db 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -12,7 +12,7 @@ ) from . import filters, forms, tables -from .models import Zone, Record +from .models import Zone, Record, export_bind_forward, export_bind_reverse from .tables import RecordZoneTable import StringIO, zipfile, time @@ -194,40 +194,8 @@ def bind_export(request, zones_list, context): }) def full_forward(request): - - zones = Zone.objects.all() - - zones_list = [] - for z in zones: - records = Record.objects.filter(zone=z) - zones_list.append({ - 'num': len(zones_list), - 'id': z.name, - 'content': z.to_bind(records) - }) - - return bind_export(request, zones_list, 'forward') + return bind_export(request, export_bind_forward(), 'forward') def full_reverse(request): - - zones = {} - - prefixes = Prefix.objects.all() - - for p in prefixes: - child_ip = IPAddress.objects.filter(address__net_contained_or_equal=str(p.prefix)) - z = p.to_bind(child_ip) - for zz in z: - if not zz['id'] in zones: - zones[zz['id']] = zz['content'] - - zones_list = [] - for zid,zc in zones.items(): - zones_list.append({ - 'num': len(zones_list), - 'id': zid, - 'content': zc, - }) - - return bind_export(request, zones_list, 'reverse') + return bind_export(request, export_bind_reverse(), 'reverse') diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index bd7754c1d3f..83f6ac1b9c1 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -123,7 +123,7 @@ class PrefixSerializer(serializers.ModelSerializer): class Meta: model = Prefix - fields = ['id', 'family', 'prefix', 'site', 'vrf', 'vlan', 'status', 'role', 'description'] + fields = ['id', 'family', 'prefix', 'site', 'vrf', 'vlan', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] class PrefixNestedSerializer(PrefixSerializer): @@ -142,7 +142,7 @@ class IPAddressSerializer(serializers.ModelSerializer): class Meta: model = IPAddress - fields = ['id', 'family', 'address', 'vrf', 'hostname', 'interface', 'description', 'nat_inside', 'nat_outside'] + fields = ['id', 'family', 'address', 'vrf', 'ptr', 'interface', 'description', 'nat_inside', 'nat_outside'] class IPAddressNestedSerializer(IPAddressSerializer): diff --git a/netbox/templates/dns/bind_export.html b/netbox/templates/dns/bind_export.html index 7794c7c0e43..db7f121070f 100644 --- a/netbox/templates/dns/bind_export.html +++ b/netbox/templates/dns/bind_export.html @@ -29,9 +29,9 @@

    BIND Export {{context}}

    Select
    - - + + + + + {% endfor %} diff --git a/netbox/templates/dns/zone_import.html b/netbox/templates/dns/zone_import.html index e24a6ebcef5..231197fafb6 100644 --- a/netbox/templates/dns/zone_import.html +++ b/netbox/templates/dns/zone_import.html @@ -68,6 +68,11 @@

    CSV Format

    + + + + + @@ -76,7 +81,7 @@

    CSV Format

    - 
    {{ z.content }}
    + +
    + 
    {{ z.content }}
    From b176fd7594437548001acb67b921236ed3d3f029 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 15:51:09 +0200 Subject: [PATCH 32/42] Update DNS doc --- docs/data-model/dns.md | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/docs/data-model/dns.md b/docs/data-model/dns.md index 5ac5218f0cf..7ecd6766417 100644 --- a/docs/data-model/dns.md +++ b/docs/data-model/dns.md @@ -4,20 +4,36 @@ The DNS component of NetBox deals with the management of DNS zones. A zone corresponds to a zone file in a DNS server, it stores the SOA (Start Of Authority) record and other records that are stored as Record objects. -The SOA Serial field is automatically created and updated each time something changes in the zone, i.e. each time you edit IP addresses or records -belonging to the zone, or the zone itself. It's in the following format : YYYYMMDDN with Y the year, M the month, D the day and N a counter. +Zone objects handle only forward DNS, reverse DNS is handled by Prefixes (in IPAM section), which also store a SOA record. -Every zone can be exported as a zone file in BIND format, directly readable by a DNS server. As zones are readable through the REST API, -with a field containing their BIND format, it is possible to write an external script which automatically updates a DNS server -configuration from the Netbox database. +Netbox provides two views in the DNS menu to get the exports in BIND format, which is compatible with every DNS server, directly or by import. Those +exports are also accessible as JSON through the REST API. One of these views is the export of all the forward zones in the database, +the second is the export of all the reverse zones. + +The reverse zones are correctly merged and/or divided to meet the requirements of a DNS server (for instance, IPv4 reverse zones must be /16 or /24), and +not to duplicate records (for instance if you have in database the prefixes 192.168.0.0/16 and 192.168.1.0/24, only the biggest will be exported) ; however, +only IP addresses which are in an active prefix will be taken into account. Obviously, reverse DNS is supported for both IPv4 and IPv6. + +The SOA Serial field is not editable : it's automatically created and managed by Netbox. Each time a zone (forward or reverse) is exported, +if there are changes since the last export or if it's the first export, the serial will be incremented. It's in the following format : +YYYYMMDDNN with Y the year, M the month, D the day and N a two-digit counter. + +As zones and their BIND exports are readable through the REST API, it is possible to write some external script to automatically update +your DNS server configuration from Netbox's database. --- # Record Each Record object represents a DNS record, i.e. a link between a hostname and a resource, which can be either an IP address or a text value, -for instance another hostname if the record is of CNAME type. +for instance another name if the record is of CNAME type. + +Records must be linked to an existing zone, and hold either an IP address link or a text value. The "Address" field points to an IP address +in database, but if you want to put an IP in your record but not in your database (if you don't own the IP for instance), it's possible +by putting the IP as text value instead. -Records must be linked to an existing zone, and hold either an existing IP address link or a text value. +You can create, edit or import records with IPs not existing yet in the database. They will be automatically created (but not the prefixes !). +However, the zones must be created first, they won't be so automatically. -Reverse DNS is not supported by Record objects, but by the "Host Name" field in IP addresses. +Reverse DNS is not supported by Record objects, but by the "PTR" field in IP addresses. If this field is modified and not empty, a corresponding +A/AAAA record is automatically created if the corresponding zone is found in the database. From 254d0220dc9bd0afaa78ac43ced3621f232ba476 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 16:19:49 +0200 Subject: [PATCH 33/42] Update DNS doc (bis) --- docs/data-model/dns.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/data-model/dns.md b/docs/data-model/dns.md index 7ecd6766417..ddaff7a7a35 100644 --- a/docs/data-model/dns.md +++ b/docs/data-model/dns.md @@ -36,4 +36,5 @@ You can create, edit or import records with IPs not existing yet in the database However, the zones must be created first, they won't be so automatically. Reverse DNS is not supported by Record objects, but by the "PTR" field in IP addresses. If this field is modified and not empty, a corresponding -A/AAAA record is automatically created if the corresponding zone is found in the database. +A/AAAA record is automatically created if the corresponding zone is found in the database. Be careful, if there was A/AAAA records +for the old PTR value, they are not deleted. From cb33881d2c4c762b217b4ef158886f1cb2fadcea Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 16:27:39 +0200 Subject: [PATCH 34/42] Fix display bug (overflow) on BIND exports pages --- netbox/templates/dns/bind_export.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/templates/dns/bind_export.html b/netbox/templates/dns/bind_export.html index db7f121070f..4784d46a92a 100644 --- a/netbox/templates/dns/bind_export.html +++ b/netbox/templates/dns/bind_export.html @@ -20,7 +20,7 @@

    BIND Export {{context}}

    {% for z in zones %} -
    +
    {{ z.id }} @@ -29,8 +29,8 @@

    BIND Export {{context}}

    Select
    - - + {% if z.extra_conf %}{% endif %}
    + + 
    {{ z.content }}
    From 0cf2abbe41769c5a287cebdc1c163f28e297c9b0 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 16:34:45 +0200 Subject: [PATCH 35/42] Update fixtures --- netbox/ipam/fixtures/ipam.json | 56 ++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/netbox/ipam/fixtures/ipam.json b/netbox/ipam/fixtures/ipam.json index 6a3190a3b31..db92ee9c906 100644 --- a/netbox/ipam/fixtures/ipam.json +++ b/netbox/ipam/fixtures/ipam.json @@ -42,7 +42,15 @@ "vlan": null, "status": 1, "role": 1, - "description": "" + "description": "", + "ttl": 10800, + "soa_name": "@", + "soa_contact": "ns.foo.net. noc.foo.net.", + "soa_serial": "2016070401", + "soa_refresh": 3600, + "soa_retry": 3600, + "soa_expire": 604800, + "soa_minimum": 1800 } }, { @@ -58,7 +66,15 @@ "vlan": null, "status": 1, "role": 1, - "description": "" + "description": "", + "ttl": 10800, + "soa_name": "", + "soa_contact": "", + "soa_serial": "", + "soa_refresh": "", + "soa_retry": "", + "soa_expire": "", + "soa_minimum": "" } }, { @@ -70,7 +86,7 @@ "family": 4, "address": "10.0.255.1/32", "vrf": null, - "hostname": "foo.net", + "ptr": "www.foo.net", "interface": 3, "nat_inside": null, "description": "" @@ -85,7 +101,7 @@ "family": 4, "address": "169.254.254.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 4, "nat_inside": null, "description": "" @@ -100,7 +116,7 @@ "family": 4, "address": "10.0.255.2/32", "vrf": null, - "hostname": "", + "ptr": "", "interface": 185, "nat_inside": null, "description": "" @@ -115,7 +131,7 @@ "family": 4, "address": "169.254.1.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 213, "nat_inside": null, "description": "" @@ -130,7 +146,7 @@ "family": 4, "address": "10.0.254.1/24", "vrf": null, - "hostname": "", + "ptr": "", "interface": 12, "nat_inside": null, "description": "" @@ -145,7 +161,7 @@ "family": 4, "address": "10.15.21.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 218, "nat_inside": null, "description": "" @@ -160,7 +176,7 @@ "family": 4, "address": "10.15.21.2/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 9, "nat_inside": null, "description": "" @@ -175,7 +191,7 @@ "family": 4, "address": "10.15.22.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 8, "nat_inside": null, "description": "" @@ -190,7 +206,7 @@ "family": 4, "address": "10.15.20.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 7, "nat_inside": null, "description": "" @@ -205,7 +221,7 @@ "family": 4, "address": "10.16.20.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 216, "nat_inside": null, "description": "" @@ -220,7 +236,7 @@ "family": 4, "address": "10.15.22.2/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 206, "nat_inside": null, "description": "" @@ -235,7 +251,7 @@ "family": 4, "address": "10.16.22.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 217, "nat_inside": null, "description": "" @@ -250,7 +266,7 @@ "family": 4, "address": "10.16.22.2/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 205, "nat_inside": null, "description": "" @@ -265,7 +281,7 @@ "family": 4, "address": "10.16.20.2/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 211, "nat_inside": null, "description": "" @@ -280,7 +296,7 @@ "family": 4, "address": "10.15.22.2/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 212, "nat_inside": null, "description": "" @@ -295,7 +311,7 @@ "family": 4, "address": "10.0.254.2/32", "vrf": null, - "hostname": "", + "ptr": "", "interface": 188, "nat_inside": null, "description": "" @@ -310,7 +326,7 @@ "family": 4, "address": "169.254.1.1/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 200, "nat_inside": null, "description": "" @@ -325,7 +341,7 @@ "family": 4, "address": "169.254.1.2/31", "vrf": null, - "hostname": "", + "ptr": "", "interface": 194, "nat_inside": null, "description": "" From 9c094f10d0037e27578369b67f599ac1a16092be Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 28 Jul 2016 17:25:57 +0200 Subject: [PATCH 36/42] DNS support Last of initial commits for DNS support --- docs/data-model/dns.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/data-model/dns.md b/docs/data-model/dns.md index ddaff7a7a35..88ff535c8f5 100644 --- a/docs/data-model/dns.md +++ b/docs/data-model/dns.md @@ -38,3 +38,4 @@ However, the zones must be created first, they won't be so automatically. Reverse DNS is not supported by Record objects, but by the "PTR" field in IP addresses. If this field is modified and not empty, a corresponding A/AAAA record is automatically created if the corresponding zone is found in the database. Be careful, if there was A/AAAA records for the old PTR value, they are not deleted. + From 50dc519a42c8faeae53e7fa1815cc6ab24488bf7 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 3 Aug 2016 11:09:20 +0200 Subject: [PATCH 37/42] Merge migrations (were conflicting) --- netbox/ipam/migrations/0010_merge.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 netbox/ipam/migrations/0010_merge.py diff --git a/netbox/ipam/migrations/0010_merge.py b/netbox/ipam/migrations/0010_merge.py new file mode 100644 index 00000000000..421bea127a6 --- /dev/null +++ b/netbox/ipam/migrations/0010_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.8 on 2016-08-03 09:06 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0007_prefix_ipaddress_add_tenant'), + ('ipam', '0009_auto_20160728_0854'), + ] + + operations = [ + ] From f873848e2950fd9c5bb5bc165d3e5b6d88935cba Mon Sep 17 00:00:00 2001 From: rdujardin Date: Wed, 3 Aug 2016 12:51:24 +0200 Subject: [PATCH 38/42] Fix to pass PEP8 check and tests --- netbox/dns/admin.py | 13 +- netbox/dns/api/serializers.py | 28 +-- netbox/dns/api/urls.py | 18 +- netbox/dns/api/views.py | 71 ++++--- netbox/dns/apps.py | 2 +- netbox/dns/filters.py | 80 ++++---- netbox/dns/formfields.py | 52 +++-- netbox/dns/forms.py | 185 ++++++++--------- netbox/dns/models.py | 364 ++++++++++++++++----------------- netbox/dns/tables.py | 82 ++++---- netbox/dns/urls.py | 42 ++-- netbox/dns/views.py | 262 +++++++++++++----------- netbox/ipam/fixtures/ipam.json | 8 +- netbox/ipam/forms.py | 2 - netbox/ipam/models.py | 113 +++++----- 15 files changed, 677 insertions(+), 645 deletions(-) diff --git a/netbox/dns/admin.py b/netbox/dns/admin.py index d5956c62472..afcca50b274 100644 --- a/netbox/dns/admin.py +++ b/netbox/dns/admin.py @@ -1,17 +1,18 @@ from django.contrib import admin from .models import ( - Zone, Record, + Zone, Record, ) @admin.register(Zone) class ZoneAdmin(admin.ModelAdmin): - list_display = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial'] - prepopulated_fields = { - 'soa_name': ['name'], - } + list_display = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial'] + prepopulated_fields = { + 'soa_name': ['name'], + } + @admin.register(Record) class RecordAdmin(admin.ModelAdmin): - list_display = ['name', 'zone', 'record_type', 'priority', 'address', 'value'] + list_display = ['name', 'zone', 'record_type', 'priority', 'address', 'value'] diff --git a/netbox/dns/api/serializers.py b/netbox/dns/api/serializers.py index ba7286a1cf1..504827301af 100644 --- a/netbox/dns/api/serializers.py +++ b/netbox/dns/api/serializers.py @@ -7,32 +7,36 @@ # Zones # + class ZoneSerializer(serializers.ModelSerializer): - class Meta: - model=Zone - fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + class Meta: + model = Zone + fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + class ZoneNestedSerializer(ZoneSerializer): - class Meta(ZoneSerializer.Meta): - fields = ['id', 'name'] + class Meta(ZoneSerializer.Meta): + fields = ['id', 'name'] # # Records # + class RecordSerializer(serializers.ModelSerializer): - zone = ZoneNestedSerializer() - address = IPAddressNestedSerializer() + zone = ZoneNestedSerializer() + address = IPAddressNestedSerializer() + + class Meta: + model = Record + fields = ['id', 'name', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] - class Meta: - model=Record - fields = ['id', 'name', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] class RecordNestedSerializer(RecordSerializer): - class Meta(RecordSerializer.Meta): - fields = ['id', 'name', 'record_type', 'zone'] + class Meta(RecordSerializer.Meta): + fields = ['id', 'name', 'record_type', 'zone'] diff --git a/netbox/dns/api/urls.py b/netbox/dns/api/urls.py index 75a9c184d1b..701be0efa69 100644 --- a/netbox/dns/api/urls.py +++ b/netbox/dns/api/urls.py @@ -4,16 +4,16 @@ urlpatterns = [ - # Zones - url(r'^zones/$', ZoneListView.as_view(), name='zone_list'), - url(r'^zones/(?P\d+)/$', ZoneDetailView.as_view(), name='zone_detail'), + # Zones + url(r'^zones/$', ZoneListView.as_view(), name='zone_list'), + url(r'^zones/(?P\d+)/$', ZoneDetailView.as_view(), name='zone_detail'), - # Records - url(r'^records/$', RecordListView.as_view(), name='record_list'), - url(r'^records/(?P\d+)/$', RecordDetailView.as_view(), name='record_detail'), + # Records + url(r'^records/$', RecordListView.as_view(), name='record_list'), + url(r'^records/(?P\d+)/$', RecordDetailView.as_view(), name='record_detail'), - # BIND Exports - url(r'^bind/forward/$', bind_forward, name='bind_forward'), - url(r'^bind/reverse/$', bind_reverse, name='bind_reverse'), + # BIND Exports + url(r'^bind/forward/$', bind_forward, name='bind_forward'), + url(r'^bind/reverse/$', bind_reverse, name='bind_reverse'), ] diff --git a/netbox/dns/api/views.py b/netbox/dns/api/views.py index 480e5772915..222f46c2815 100644 --- a/netbox/dns/api/views.py +++ b/netbox/dns/api/views.py @@ -14,56 +14,63 @@ # Zones # + class ZoneListView(generics.ListAPIView): - """ - List all zones - """ - queryset = Zone.objects.all() - serializer_class = serializers.ZoneSerializer - filter_class = filters.ZoneFilter + """ + List all zones + """ + queryset = Zone.objects.all() + serializer_class = serializers.ZoneSerializer + filter_class = filters.ZoneFilter + class ZoneDetailView(generics.RetrieveAPIView): - """ - Retrieve a single zone - """ - queryset = Zone.objects.all() - serializer_class = serializers.ZoneSerializer + """ + Retrieve a single zone + """ + queryset = Zone.objects.all() + serializer_class = serializers.ZoneSerializer + # # Records # + class RecordListView(generics.ListAPIView): - """ - List all records - """ - queryset = Record.objects.all() - serializer_class = serializers.RecordSerializer + """ + List all records + """ + queryset = Record.objects.all() + serializer_class = serializers.RecordSerializer + class RecordDetailView(generics.RetrieveAPIView): - """ - Retrieve a single record - """ - queryset = Record.objects.all() - serializer_class = serializers.RecordSerializer + """ + Retrieve a single record + """ + queryset = Record.objects.all() + serializer_class = serializers.RecordSerializer + # # BIND Exports # + @api_view(['GET']) def bind_forward(request): - """ - Full export of forward zones in BIND format - """ - zones_list = export_bind_forward() - return Response(zones_list) + """ + Full export of forward zones in BIND format + """ + zones_list = export_bind_forward() + return Response(zones_list) + @api_view(['GET']) def bind_reverse(request): - """ - Full export of reverse zones in BIND format - """ - zones_list = export_bind_reverse() - return Response(zones_list) - + """ + Full export of reverse zones in BIND format + """ + zones_list = export_bind_reverse() + return Response(zones_list) diff --git a/netbox/dns/apps.py b/netbox/dns/apps.py index a8e0badcb88..451ca92b81a 100644 --- a/netbox/dns/apps.py +++ b/netbox/dns/apps.py @@ -3,4 +3,4 @@ class DNSConfig(AppConfig): name = 'dns' - verbose_name='DNS' + verbose_name = 'DNS' diff --git a/netbox/dns/filters.py b/netbox/dns/filters.py index 1c0c733898f..8bc26d3239d 100644 --- a/netbox/dns/filters.py +++ b/netbox/dns/filters.py @@ -3,49 +3,51 @@ from ipam.models import IPAddress from .models import ( - Zone, - Record, + Zone, + Record, ) from .forms import record_type_choices + class ZoneFilter(django_filters.FilterSet): - name = django_filters.CharFilter( - name = 'name', - lookup_type = 'icontains', - label = 'Name', - ) + name = django_filters.CharFilter( + name='name', + lookup_type='icontains', + label='Name', + ) + + class Meta: + model = Zone + fields = ['name'] - class Meta: - model = Zone - fields = ['name'] class RecordFilter(django_filters.FilterSet): - zone__name = django_filters.ModelMultipleChoiceFilter( - name = 'zone__name', - to_field_name = 'name', - lookup_type = 'icontains', - queryset = Zone.objects.all(), - label = 'Zone (Name)', - ) - record_type = django_filters.MultipleChoiceFilter( - name = 'record_type', - label = 'Type', - choices = record_type_choices - ) - name = django_filters.CharFilter( - name = 'name', - lookup_type = 'icontains', - label = 'Name', - ) - name_or_value_or_ip = django_filters.MethodFilter( - name = 'name_or_value_or_ip', - ) - - class Meta: - model=Record - field = ['name', 'record_type', 'value'] - - def filter_name_or_value_or_ip(self, queryset, value): - if not value: - return queryset - return queryset.filter(Q(name__icontains=value) | Q(value__icontains=value) | Q(address__address__icontains=value)) + zone__name = django_filters.ModelMultipleChoiceFilter( + name='zone__name', + to_field_name='name', + lookup_type='icontains', + queryset=Zone.objects.all(), + label='Zone (Name)', + ) + record_type = django_filters.MultipleChoiceFilter( + name='record_type', + label='Type', + choices=record_type_choices + ) + name = django_filters.CharFilter( + name='name', + lookup_type='icontains', + label='Name', + ) + name_or_value_or_ip = django_filters.MethodFilter( + name='name_or_value_or_ip', + ) + + class Meta: + model = Record + field = ['name', 'record_type', 'value'] + + def filter_name_or_value_or_ip(self, queryset, value): + if not value: + return queryset + return queryset.filter(Q(name__icontains=value) | Q(value__icontains=value) | Q(address__address__icontains=value)) diff --git a/netbox/dns/formfields.py b/netbox/dns/formfields.py index 6c1049f6559..202363dbb53 100644 --- a/netbox/dns/formfields.py +++ b/netbox/dns/formfields.py @@ -12,30 +12,28 @@ # class AddressFormField(forms.Field): - default_error_messages = { - 'invalid': "Enter a valid IPv4 or IPv6 address (with CIDR mask).", - } - - def to_python(self, value): - if not value: - return None - - # Ensure that a subnet mask has been specified. This prevents IPs from defaulting to a /32 or /128. - if len(value.split('/')) != 2: - raise ValidationError('CIDR mask (e.g. /24) is required.') - - try: - net = IPNetwork(value) - except AddrFormatError: - raise ValidationError("Please specify a valid IPv4 or IPv6 address.") - - ip = IPAddress.objects.filter(address=value) - if not ip: - net = IPNetwork(value) - obj = IPAddress(address=net) - obj.save() - return obj - else: - return ip[0] - - + default_error_messages = { + 'invalid': "Enter a valid IPv4 or IPv6 address (with CIDR mask).", + } + + def to_python(self, value): + if not value: + return None + + # Ensure that a subnet mask has been specified. This prevents IPs from defaulting to a /32 or /128. + if len(value.split('/')) != 2: + raise ValidationError('CIDR mask (e.g. /24) is required.') + + try: + net = IPNetwork(value) + except AddrFormatError: + raise ValidationError("Please specify a valid IPv4 or IPv6 address.") + + ip = IPAddress.objects.filter(address=value) + if not ip: + net = IPNetwork(value) + obj = IPAddress(address=net) + obj.save() + return obj + else: + return ip[0] diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py index 94f3d3ffea9..06ee4256213 100644 --- a/netbox/dns/forms.py +++ b/netbox/dns/forms.py @@ -3,12 +3,12 @@ from ipam.models import IPAddress from utilities.forms import ( - BootstrapMixin, ConfirmationForm, APISelect, Livesearch, CSVDataField, BulkImportForm, + BootstrapMixin, ConfirmationForm, APISelect, Livesearch, CSVDataField, BulkImportForm, ) from .models import ( - Zone, - Record, + Zone, + Record, ) from .formfields import AddressFormField @@ -17,131 +17,134 @@ # Zones # + class ZoneForm(forms.ModelForm, BootstrapMixin): - class Meta: - model=Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] - labels = { - 'soa_name': 'SOA Name', - 'soa_contact': 'SOA Contact', - 'soa_refresh': 'SOA Refresh', - 'soa_retry': 'SOA Retry', - 'soa_expire': 'SOA Expire', - 'soa_minimum': 'SOA Minimum', - 'description': 'Description', - } - help_texts = { - 'ttl': "Time to live, in seconds", - 'soa_name': "The primary name server for the domain, @ for origin", - 'soa_contact': "The responsible party for the domain (e.g. ns.foo.net. noc.foo.net.)", - 'soa_refresh': "Refresh time, in seconds", - 'soa_retry': "Retry time, in seconds", - 'soa_expire': "Expire time, in seconds", - 'soa_minimum': "Negative result TTL, in seconds", - } + class Meta: + model = Zone + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + labels = { + 'soa_name': 'SOA Name', + 'soa_contact': 'SOA Contact', + 'soa_refresh': 'SOA Refresh', + 'soa_retry': 'SOA Retry', + 'soa_expire': 'SOA Expire', + 'soa_minimum': 'SOA Minimum', + 'description': 'Description', + } + help_texts = { + 'ttl': "Time to live, in seconds", + 'soa_name': "The primary name server for the domain, @ for origin", + 'soa_contact': "The responsible party for the domain (e.g. ns.foo.net. noc.foo.net.)", + 'soa_refresh': "Refresh time, in seconds", + 'soa_retry': "Retry time, in seconds", + 'soa_expire': "Expire time, in seconds", + 'soa_minimum': "Negative result TTL, in seconds", + } + class ZoneFromCSVForm(forms.ModelForm): - class Meta: - model=Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + class Meta: + model = Zone + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + class ZoneImportForm(BulkImportForm, BootstrapMixin): - csv = CSVDataField(csv_form=ZoneFromCSVForm) + csv = CSVDataField(csv_form=ZoneFromCSVForm) + class ZoneBulkEditForm(forms.Form, BootstrapMixin): - pk = forms.ModelMultipleChoiceField(queryset=Zone.objects.all(), widget=forms.MultipleHiddenInput) - name = forms.CharField(max_length=100, required=False, label='Name') - ttl = forms.IntegerField(required=False, label='TTL') - soa_name = forms.CharField(max_length=100, required=False, label='SOA Name') - soa_contact = forms.CharField(max_length=100, required=False, label='SOA Contact') - soa_refresh = forms.IntegerField(required=False, label='SOA Refresh') - soa_retry = forms.IntegerField(required=False, label='SOA Retry') - soa_expire = forms.IntegerField(required=False, label='SOA Expire') - soa_minimum = forms.IntegerField(required=False, label='SOA Minimum') - description = forms.CharField(max_length=100, required=False, label='Description') + pk = forms.ModelMultipleChoiceField(queryset=Zone.objects.all(), widget=forms.MultipleHiddenInput) + name = forms.CharField(max_length=100, required=False, label='Name') + ttl = forms.IntegerField(required=False, label='TTL') + soa_name = forms.CharField(max_length=100, required=False, label='SOA Name') + soa_contact = forms.CharField(max_length=100, required=False, label='SOA Contact') + soa_refresh = forms.IntegerField(required=False, label='SOA Refresh') + soa_retry = forms.IntegerField(required=False, label='SOA Retry') + soa_expire = forms.IntegerField(required=False, label='SOA Expire') + soa_minimum = forms.IntegerField(required=False, label='SOA Minimum') + description = forms.CharField(max_length=100, required=False, label='Description') class ZoneBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Zone.objects.all(), widget=forms.MultipleHiddenInput) + pk = forms.ModelMultipleChoiceField(queryset=Zone.objects.all(), widget=forms.MultipleHiddenInput) + class ZoneFilterForm(forms.Form, BootstrapMixin): - pass + pass # # Records # + class RecordForm(forms.ModelForm, BootstrapMixin): - address = AddressFormField(required=False) + address = AddressFormField(required=False) - class Meta: - model=Record - fields = ['name', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] - labels = { - 'record_type': 'Type', - } - help_texts = { - 'name': 'Host name, @ for origin (e.g. www)', - 'record_type': 'Record type (e.g. MX or AAAA)', - 'priority': 'Priority level (e.g. 10)', - 'zone': 'Zone the record belongs to', - 'address': 'IP address if value is an IP address, in AAAA records for instance', - 'value': 'Text value else, in CNAME records for instance' - } + class Meta: + model = Record + fields = ['name', 'record_type', 'priority', 'zone', 'address', 'value', 'description'] + labels = { + 'record_type': 'Type', + } + help_texts = { + 'name': 'Host name, @ for origin (e.g. www)', + 'record_type': 'Record type (e.g. MX or AAAA)', + 'priority': 'Priority level (e.g. 10)', + 'zone': 'Zone the record belongs to', + 'address': 'IP address if value is an IP address, in AAAA records for instance', + 'value': 'Text value else, in CNAME records for instance' + } class RecordFromCSVForm(forms.ModelForm): - zone = forms.ModelChoiceField(queryset=Zone.objects.all(), to_field_name='name', error_messages={'invalid_choice': 'Zone not found.'}) - address = AddressFormField(required=False) - - class Meta: - model=Record - fields = ['zone', 'name', 'record_type', 'priority', 'address', 'value', 'description'] + zone = forms.ModelChoiceField(queryset=Zone.objects.all(), to_field_name='name', error_messages={'invalid_choice': 'Zone not found.'}) + address = AddressFormField(required=False) -# class RecordBINDImportForm(forms.Form, BootstrapMixin): -# bind = BINDDataField() -# zone_name = CharField(max_length=100, label='Zone') -# slash_v4 = IntegerField() + class Meta: + model = Record + fields = ['zone', 'name', 'record_type', 'priority', 'address', 'value', 'description'] -# def clean(self): -# self.cleaned_data class RecordImportForm(BulkImportForm, BootstrapMixin): - csv = CSVDataField(csv_form=RecordFromCSVForm) + csv = CSVDataField(csv_form=RecordFromCSVForm) + class RecordBulkEditForm(forms.Form, BootstrapMixin): - pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) - name = forms.CharField(max_length=100, required=False, label='Name') - record_type = forms.CharField(max_length=100, required=False, label='Type') - priority = forms.IntegerField(required=False) - zone = forms.ModelChoiceField(queryset=Zone.objects.all(), required=False) - address = AddressFormField(required=False) - value = forms.CharField(max_length=100, required=False) + pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) + name = forms.CharField(max_length=100, required=False, label='Name') + record_type = forms.CharField(max_length=100, required=False, label='Type') + priority = forms.IntegerField(required=False) + zone = forms.ModelChoiceField(queryset=Zone.objects.all(), required=False) + address = AddressFormField(required=False) + value = forms.CharField(max_length=100, required=False) + class RecordBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) + pk = forms.ModelMultipleChoiceField(queryset=Record.objects.all(), widget=forms.MultipleHiddenInput) + def record_zone_choices(): - zone_choices = Zone.objects.annotate(record_count=Count('records')) - return [(z.name, '{} ({})'.format(z.name, z.record_count)) for z in zone_choices] + zone_choices = Zone.objects.annotate(record_count=Count('records')) + return [(z.name, '{} ({})'.format(z.name, z.record_count)) for z in zone_choices] + def record_type_choices(): - type_choices = {} - records = Record.objects.all() - for r in records: - if not r.record_type in type_choices: - type_choices[r.record_type]=1 - else: - type_choices[r.record_type]+=1 - return [(t, '{} ({})'.format(t, count)) for t,count in type_choices.items()] + type_choices = {} + records = Record.objects.all() + for r in records: + if r.record_type not in type_choices: + type_choices[r.record_type] = 1 + else: + type_choices[r.record_type] += 1 + return [(t, '{} ({})'.format(t, count)) for t, count in type_choices.items()] -class RecordFilterForm(forms.Form, BootstrapMixin): - zone__name = forms.MultipleChoiceField(required=False, choices=record_zone_choices, label='Zone', - widget=forms.SelectMultiple(attrs={'size': 8})) - record_type = forms.MultipleChoiceField(required=False, choices=record_type_choices, label='Type', - widget=forms.SelectMultiple(attrs={'size': 8})) +class RecordFilterForm(forms.Form, BootstrapMixin): + zone__name = forms.MultipleChoiceField(required=False, choices=record_zone_choices, label='Zone', + widget=forms.SelectMultiple(attrs={'size': 8})) + record_type = forms.MultipleChoiceField(required=False, choices=record_type_choices, label='Type', + widget=forms.SelectMultiple(attrs={'size': 8})) diff --git a/netbox/dns/models.py b/netbox/dns/models.py index d4b73003b44..61fd417f7c1 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -4,7 +4,6 @@ from django.core.urlresolvers import reverse from django.db import models -#from ipam.models import IPAddress from utilities.models import CreatedUpdatedModel import time @@ -14,201 +13,202 @@ import ipam.models -class Zone(CreatedUpdatedModel): - """ - A Zone represents a DNS zone. It contains SOA data but no records, records are represented as Record objects. - """ - name = models.CharField(max_length=100) - ttl = models.PositiveIntegerField() - soa_name = models.CharField(max_length=100) - soa_contact = models.CharField(max_length=100) - - soa_serial = models.CharField(max_length=10) - bind_changed = models.BooleanField(default=True) - - soa_refresh = models.PositiveIntegerField() - soa_retry = models.PositiveIntegerField() - soa_expire = models.PositiveIntegerField() - soa_minimum = models.PositiveIntegerField() - description = models.CharField(max_length=100, blank=True) - - class Meta: - ordering = ['name'] - - def __unicode__(self): - return self.name - - def get_absolute_url(self): - return reverse('dns:zone', args=[self.pk]) - - def save(self, *args, **kwargs): - self.bind_changed = True - super(Zone, self).save(*args, **kwargs) - - def set_bind_changed(self, value): - self.bind_changed = value - super(Zone, self).save() - - def update_serial(self): - """ - Each time a record or the zone is modified, the serial is incremented. - """ - current_date = time.strftime('%Y%m%d',time.localtime()) - if not self.soa_serial: - self.soa_serial = current_date+'01' - else: - serial_date = self.soa_serial[:8] - serial_num = self.soa_serial[8:] - - if serial_date!=current_date: - self.soa_serial = current_date+'01' - else: - serial_num = int(serial_num) - serial_num += 1 - if serial_num<10: - self.soa_serial = current_date + '0' + str(serial_num) - else: - self.soa_serial = current_date + str(serial_num) - self.set_bind_changed(False) - - - def to_csv(self): - return ','.join([ - self.name, - str(self.ttl), - self.soa_name, - self.soa_contact, - self.soa_serial, - str(self.soa_refresh), - str(self.soa_retry), - str(self.soa_expire), - str(self.soa_minimum), - self.description, - ]) - - def to_bind(self,records): - if self.bind_changed: - self.update_serial() - bind_records = '' - for r in records: - bind_records += r.to_bind()+'\n' - bind_export = '\n'.join([ - '; '+self.name+((' ('+self.description+')') if self.description else ''), - '; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ', - '', - '$TTL '+str(self.ttl), - self.soa_name.ljust(30)+' IN '+'SOA '+self.soa_contact+' (', - ' '+self.soa_serial.ljust(30)+' ; serial', - ' '+str(self.soa_refresh).ljust(30)+' ; refresh', - ' '+str(self.soa_retry).ljust(30)+' ; retry', - ' '+str(self.soa_expire).ljust(30)+' ; expire', - ' '+str(self.soa_minimum).ljust(29)+') ; minimum', - '', - '', - '', - ]) - bind_export += '\n'+bind_records - bind_export += '\n'+'; end ' - return bind_export +class Zone(CreatedUpdatedModel): + """ + A Zone represents a DNS zone. It contains SOA data but no records, records are represented as Record objects. + """ + name = models.CharField(max_length=100) + ttl = models.PositiveIntegerField() + soa_name = models.CharField(max_length=100) + soa_contact = models.CharField(max_length=100) + + soa_serial = models.CharField(max_length=10) + bind_changed = models.BooleanField(default=True) + + soa_refresh = models.PositiveIntegerField() + soa_retry = models.PositiveIntegerField() + soa_expire = models.PositiveIntegerField() + soa_minimum = models.PositiveIntegerField() + description = models.CharField(max_length=100, blank=True) + + class Meta: + ordering = ['name'] + + def __unicode__(self): + return self.name + + def get_absolute_url(self): + return reverse('dns:zone', args=[self.pk]) + + def save(self, *args, **kwargs): + self.bind_changed = True + super(Zone, self).save(*args, **kwargs) + + def set_bind_changed(self, value): + self.bind_changed = value + super(Zone, self).save() + + def update_serial(self): + """ + Each time a record or the zone is modified, the serial is incremented. + """ + current_date = time.strftime('%Y%m%d', time.localtime()) + if not self.soa_serial: + self.soa_serial = current_date + '01' + else: + serial_date = self.soa_serial[:8] + serial_num = self.soa_serial[8:] + + if serial_date != current_date: + self.soa_serial = current_date + '01' + else: + serial_num = int(serial_num) + serial_num += 1 + if serial_num < 10: + self.soa_serial = current_date + '0' + str(serial_num) + else: + self.soa_serial = current_date + str(serial_num) + self.set_bind_changed(False) + + def to_csv(self): + return ','.join([ + self.name, + str(self.ttl), + self.soa_name, + self.soa_contact, + self.soa_serial, + str(self.soa_refresh), + str(self.soa_retry), + str(self.soa_expire), + str(self.soa_minimum), + self.description, + ]) + + def to_bind(self, records): + if self.bind_changed: + self.update_serial() + bind_records = '' + for r in records: + bind_records += r.to_bind() + '\n' + bind_export = '\n'.join([ + '; ' + self.name + ((' (' + self.description + ')') if self.description else ''), + '; gen by netbox ( ' + time.strftime('%A %B %d %Y %H:%M:%S', time.localtime()) + ' ) ', + '', + '$TTL ' + str(self.ttl), + self.soa_name.ljust(30) + ' IN ' + 'SOA ' + self.soa_contact + ' (', + ' ' + self.soa_serial.ljust(30) + ' ; serial', + ' ' + str(self.soa_refresh).ljust(30) + ' ; refresh', + ' ' + str(self.soa_retry).ljust(30) + ' ; retry', + ' ' + str(self.soa_expire).ljust(30) + ' ; expire', + ' ' + str(self.soa_minimum).ljust(29) + ') ; minimum', + '', + '', + '', + ]) + bind_export += '\n' + bind_records + bind_export += '\n' + '; end ' + return bind_export class Record(CreatedUpdatedModel): - """ - A Record represents a DNS record, i.e. a row in a DNS zone. - """ - name = models.CharField(max_length=100) - record_type = models.CharField(max_length=10) - priority = models.PositiveIntegerField(blank=True, null=True) - zone = models.ForeignKey('Zone', related_name='records', on_delete=models.CASCADE) - address = models.ForeignKey('ipam.IPAddress', related_name='records', on_delete=models.PROTECT, blank=True, null=True) - value = models.CharField(max_length=100, blank=True) - description = models.CharField(max_length=20, blank=True) - - class Meta: - ordering = ['name'] - - def __unicode__(self): - return self.name - - def get_absolute_url(self): - return reverse('dns:record', args=[self.pk]) - - def clean(self): - self.record_type = self.record_type.upper() - if not self.address and not self.value: - raise ValidationError("DNS records must have either an IP address or a text value") - - def save(self, *args, **kwargs): - self.zone.save() # in order to update serial. - super(Record, self).save(*args, **kwargs) - - def to_csv(self): - return ','.join([ - self.zone.name, - self.name, - self.record_type, - str(self.priority) if self.priority else '', - str(self.address) if self.address else '', - self.value, - self.description, - ]) - - def to_bind(self): - return ''.join([ - (self.name if self.name!='@' else '').ljust(30), - ' IN ', - self.record_type.upper().ljust(10), - ' ', - (str(self.priority) if self.priority else '').ljust(4), - ' ', - (str(self.address).split('/')[0] if self.address else self.value).ljust(25), - ' ', - ' ; '+self.description+' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ' - ]) + """ + A Record represents a DNS record, i.e. a row in a DNS zone. + """ + name = models.CharField(max_length=100) + record_type = models.CharField(max_length=10) + priority = models.PositiveIntegerField(blank=True, null=True) + zone = models.ForeignKey('Zone', related_name='records', on_delete=models.CASCADE) + address = models.ForeignKey('ipam.IPAddress', related_name='records', on_delete=models.PROTECT, blank=True, null=True) + value = models.CharField(max_length=100, blank=True) + description = models.CharField(max_length=20, blank=True) + + class Meta: + ordering = ['name'] + + def __unicode__(self): + return self.name + + def get_absolute_url(self): + return reverse('dns:record', args=[self.pk]) + + def clean(self): + self.record_type = self.record_type.upper() + if not self.address and not self.value: + raise ValidationError("DNS records must have either an IP address or a text value") + + def save(self, *args, **kwargs): + self.zone.save() # in order to update serial. + super(Record, self).save(*args, **kwargs) + + def to_csv(self): + return ','.join([ + self.zone.name, + self.name, + self.record_type, + str(self.priority) if self.priority else '', + str(self.address) if self.address else '', + self.value, + self.description, + ]) + + def to_bind(self): + return ''.join([ + (self.name if self.name != '@' else '').ljust(30), + ' IN ', + self.record_type.upper().ljust(10), + ' ', + (str(self.priority) if self.priority else '').ljust(4), + ' ', + (str(self.address).split('/')[0] if self.address else self.value).ljust(25), + ' ', + ' ; ' + self.description + ' ; gen by netbox ( ' + time.strftime('%A %B %d %Y %H:%M:%S', time.localtime()) + ' ) ' + ]) + @receiver(pre_delete, sender=Record) def on_record_delete(sender, **kwargs): - kwargs['instance'].zone.save() + kwargs['instance'].zone.save() + # # BIND Exports # -def export_bind_forward(): - zones = Zone.objects.all() - - zones_list = [] - for z in zones: - records = Record.objects.filter(zone=z) - zones_list.append({ - 'num': len(zones_list), - 'id': z.name, - 'content': z.to_bind(records) - }) - return zones_list - -def export_bind_reverse(): - zones = {} - - prefixes = ipam.models.Prefix.objects.all() - - for p in prefixes: - child_ip = ipam.models.IPAddress.objects.filter(address__net_contained_or_equal=str(p.prefix)) - z = p.to_bind(child_ip) - for zz in z: - if not zz['id'] in zones: - zones[zz['id']] = zz['content'] +def export_bind_forward(): + zones = Zone.objects.all() - zones_list = [] - for zid,zc in zones.items(): - zones_list.append({ - 'num': len(zones_list), - 'id': zid, - 'content': zc, - }) + zones_list = [] + for z in zones: + records = Record.objects.filter(zone=z) + zones_list.append({ + 'num': len(zones_list), + 'id': z.name, + 'content': z.to_bind(records) + }) - return zones_list + return zones_list +def export_bind_reverse(): + zones = {} + + prefixes = ipam.models.Prefix.objects.all() + + for p in prefixes: + child_ip = ipam.models.IPAddress.objects.filter(address__net_contained_or_equal=str(p.prefix)) + z = p.to_bind(child_ip) + for zz in z: + if not zz['id'] in zones: + zones[zz['id']] = zz['content'] + + zones_list = [] + for zid, zc in zones.items(): + zones_list.append({ + 'num': len(zones_list), + 'id': zid, + 'content': zc, + }) + + return zones_list diff --git a/netbox/dns/tables.py b/netbox/dns/tables.py index 3444bc84cc6..01f092359b6 100644 --- a/netbox/dns/tables.py +++ b/netbox/dns/tables.py @@ -10,54 +10,58 @@ # Zones # + class ZoneTable(BaseTable): - pk = ToggleColumn() - name = tables.LinkColumn('dns:zone', args=[Accessor('pk')], verbose_name='Name') - record_count = tables.Column(verbose_name='Records') - ttl = tables.Column(verbose_name='TTL') - soa_name = tables.Column(verbose_name='SOA Name') - soa_contact = tables.Column(verbose_name='SOA Contact') - soa_serial = tables.Column(verbose_name='SOA Serial') - - class Meta(BaseTable.Meta): - model = Zone - fields = ('pk', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial') + pk = ToggleColumn() + name = tables.LinkColumn('dns:zone', args=[Accessor('pk')], verbose_name='Name') + record_count = tables.Column(verbose_name='Records') + ttl = tables.Column(verbose_name='TTL') + soa_name = tables.Column(verbose_name='SOA Name') + soa_contact = tables.Column(verbose_name='SOA Contact') + soa_serial = tables.Column(verbose_name='SOA Serial') + + class Meta(BaseTable.Meta): + model = Zone + fields = ('pk', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial') + # # Records # + class RecordTable(BaseTable): - pk = ToggleColumn() - name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') - record_type = tables.Column(verbose_name='Type') - priority = tables.Column(verbose_name='Priority') - address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') - value = tables.Column(verbose_name='Text Value') - zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') - - class Meta(BaseTable.Meta): - model=Record - fields = ('pk', 'name', 'record_type', 'priority', 'address', 'value') + pk = ToggleColumn() + name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + record_type = tables.Column(verbose_name='Type') + priority = tables.Column(verbose_name='Priority') + address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') + value = tables.Column(verbose_name='Text Value') + zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') + + class Meta(BaseTable.Meta): + model = Record + fields = ('pk', 'name', 'record_type', 'priority', 'address', 'value') + class RecordBriefTable(BaseTable): - name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') - record_type = tables.Column(verbose_name='Type') - priority = tables.Column(verbose_name='Priority') - zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') + name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + record_type = tables.Column(verbose_name='Type') + priority = tables.Column(verbose_name='Priority') + zone = tables.LinkColumn('dns:zone', args=[Accessor('zone.pk')], verbose_name='Zone') + + class Meta(BaseTable.Meta): + model = Record + fields = ('name', 'record_type', 'priority', 'zone') - class Meta(BaseTable.Meta): - model=Record - fields = ('name', 'record_type', 'priority', 'zone') class RecordZoneTable(BaseTable): - name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') - record_type = tables.Column(verbose_name='Type') - priority = tables.Column(verbose_name='Priority') - address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') - value = tables.Column(verbose_name='Value') - - class Meta(BaseTable.Meta): - model=Record - fields = ('name', 'record_type', 'priority', 'address', 'value') - \ No newline at end of file + name = tables.LinkColumn('dns:record', args=[Accessor('pk')], verbose_name='Name') + record_type = tables.Column(verbose_name='Type') + priority = tables.Column(verbose_name='Priority') + address = tables.LinkColumn('ipam:ipaddress', args=[Accessor('address.pk')], verbose_name='IP Address') + value = tables.Column(verbose_name='Value') + + class Meta(BaseTable.Meta): + model = Record + fields = ('name', 'record_type', 'priority', 'address', 'value') diff --git a/netbox/dns/urls.py b/netbox/dns/urls.py index 98e38fcc840..1fd231f5c3a 100644 --- a/netbox/dns/urls.py +++ b/netbox/dns/urls.py @@ -4,28 +4,28 @@ urlpatterns = [ - # Zones - url(r'^zones/$', views.ZoneListView.as_view(), name='zone_list'), - url(r'^zones/add/$', views.ZoneEditView.as_view(), name='zone_add'), - url(r'^zones/import/$', views.ZoneBulkImportView.as_view(), name='zone_import'), - url(r'^zones/edit/$', views.ZoneBulkEditView.as_view(), name='zone_bulk_edit'), - url(r'^zones/delete/$', views.ZoneBulkDeleteView.as_view(), name='zone_bulk_delete'), - url(r'^zones/(?P\d+)/$', views.zone, name='zone'), - url(r'^zones/(?P\d+)/edit/$', views.ZoneEditView.as_view(), name='zone_edit'), - url(r'^zones/(?P\d+)/delete/$', views.ZoneDeleteView.as_view(), name='zone_delete'), + # Zones + url(r'^zones/$', views.ZoneListView.as_view(), name='zone_list'), + url(r'^zones/add/$', views.ZoneEditView.as_view(), name='zone_add'), + url(r'^zones/import/$', views.ZoneBulkImportView.as_view(), name='zone_import'), + url(r'^zones/edit/$', views.ZoneBulkEditView.as_view(), name='zone_bulk_edit'), + url(r'^zones/delete/$', views.ZoneBulkDeleteView.as_view(), name='zone_bulk_delete'), + url(r'^zones/(?P\d+)/$', views.zone, name='zone'), + url(r'^zones/(?P\d+)/edit/$', views.ZoneEditView.as_view(), name='zone_edit'), + url(r'^zones/(?P\d+)/delete/$', views.ZoneDeleteView.as_view(), name='zone_delete'), - # Records - url(r'^records/$', views.RecordListView.as_view(), name='record_list'), - url(r'^records/add/$', views.RecordEditView.as_view(), name='record_add'), - url(r'^records/import/$', views.RecordBulkImportView.as_view(), name='record_import'), - url(r'^records/edit/$', views.RecordBulkEditView.as_view(), name='record_bulk_edit'), - url(r'^records/delete/$', views.RecordBulkDeleteView.as_view(), name='record_bulk_delete'), - url(r'^records/(?P\d+)/$', views.record, name='record'), - url(r'^records/(?P\d+)/edit/$', views.RecordEditView.as_view(), name='record_edit'), - url(r'^records/(?P\d+)/delete/$', views.RecordDeleteView.as_view(), name='record_delete'), + # Records + url(r'^records/$', views.RecordListView.as_view(), name='record_list'), + url(r'^records/add/$', views.RecordEditView.as_view(), name='record_add'), + url(r'^records/import/$', views.RecordBulkImportView.as_view(), name='record_import'), + url(r'^records/edit/$', views.RecordBulkEditView.as_view(), name='record_bulk_edit'), + url(r'^records/delete/$', views.RecordBulkDeleteView.as_view(), name='record_bulk_delete'), + url(r'^records/(?P\d+)/$', views.record, name='record'), + url(r'^records/(?P\d+)/edit/$', views.RecordEditView.as_view(), name='record_edit'), + url(r'^records/(?P\d+)/delete/$', views.RecordDeleteView.as_view(), name='record_delete'), - # BIND Exports - url(r'^bind/forward/$', views.full_forward, name='full_forward'), - url(r'^bind/reverse/$', views.full_reverse, name='full_reverse'), + # BIND Exports + url(r'^bind/forward/$', views.full_forward, name='full_forward'), + url(r'^bind/reverse/$', views.full_reverse, name='full_reverse'), ] diff --git a/netbox/dns/views.py b/netbox/dns/views.py index b8f3ad0d9db..7e3ec14923d 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -8,81 +8,88 @@ from ipam.models import IPAddress, Prefix from utilities.paginator import EnhancedPaginator from utilities.views import ( - BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView, + BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView, ) from . import filters, forms, tables from .models import Zone, Record, export_bind_forward, export_bind_reverse from .tables import RecordZoneTable -import StringIO, zipfile, time +import StringIO +import zipfile +import time # # Zones # + class ZoneListView(ObjectListView): - queryset = Zone.objects.annotate(record_count=Count('records')) - filter = filters.ZoneFilter - filter_form = forms.ZoneFilterForm - table = tables.ZoneTable - edit_permissions = ['dns.change_zone', 'dns.delete_zone'] - template_name = 'dns/zone_list.html' + queryset = Zone.objects.annotate(record_count=Count('records')) + filter = filters.ZoneFilter + filter_form = forms.ZoneFilterForm + table = tables.ZoneTable + edit_permissions = ['dns.change_zone', 'dns.delete_zone'] + template_name = 'dns/zone_list.html' + def zone(request, pk): - zone = get_object_or_404(Zone.objects.all(), pk=pk) - records = Record.objects.filter(zone=zone) - record_count = len(records) + zone = get_object_or_404(Zone.objects.all(), pk=pk) + records = Record.objects.filter(zone=zone) + record_count = len(records) + + # DNS records + dns_records = Record.objects.filter(zone=zone) + dns_records_table = RecordZoneTable(dns_records) - # DNS records - dns_records = Record.objects.filter(zone=zone) - dns_records_table = RecordZoneTable(dns_records) + return render(request, 'dns/zone.html', { + 'zone': zone, + 'records': records, + 'record_count': record_count, + 'dns_records_table': dns_records_table, + }) - return render(request, 'dns/zone.html', { - 'zone': zone, - 'records': records, - 'record_count': record_count, - 'dns_records_table': dns_records_table, - }) class ZoneEditView(PermissionRequiredMixin, ObjectEditView): - permission_required = 'dns.change_zone' - model = Zone - form_class = forms.ZoneForm - cancel_url = 'dns:zone_list' + permission_required = 'dns.change_zone' + model = Zone + form_class = forms.ZoneForm + cancel_url = 'dns:zone_list' + class ZoneDeleteView(PermissionRequiredMixin, ObjectDeleteView): - permission_required = 'dns.delete_zone' - model = Zone - redirect_url = 'dns:zone_list' + permission_required = 'dns.delete_zone' + model = Zone + redirect_url = 'dns:zone_list' class ZoneBulkImportView(PermissionRequiredMixin, BulkImportView): - permission_required = 'dns.add_zone' - form = forms.ZoneImportForm - table = tables.ZoneTable - template_name = 'dns/zone_import.html' - obj_list_url = 'dns:zone_list' + permission_required = 'dns.add_zone' + form = forms.ZoneImportForm + table = tables.ZoneTable + template_name = 'dns/zone_import.html' + obj_list_url = 'dns:zone_list' + class ZoneBulkEditView(PermissionRequiredMixin, BulkEditView): - permission_required = 'dns.change_zone' - cls = Zone - form = forms.ZoneBulkEditForm - template_name = 'dns/zone_bulk_edit.html' - default_redirect_url = 'dns:zone_list' + permission_required = 'dns.change_zone' + cls = Zone + form = forms.ZoneBulkEditForm + template_name = 'dns/zone_bulk_edit.html' + default_redirect_url = 'dns:zone_list' - def update_objects(self, pk_list, form): + def update_objects(self, pk_list, form): - fields_to_update = {} - for field in ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum']: - if form.cleaned_data[field]: - fields_to_update[field] = form.cleaned_data[field] + fields_to_update = {} + for field in ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum']: + if form.cleaned_data[field]: + fields_to_update[field] = form.cleaned_data[field] - zlist = self.cls.objects.filter(pk__in=pk_list) - for z in zlist: - z.set_bind_changed(True) - return zlist.update(**fields_to_update) + zlist = self.cls.objects.filter(pk__in=pk_list) + for z in zlist: + z.set_bind_changed(True) + return zlist.update(**fields_to_update) class ZoneBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): @@ -91,111 +98,122 @@ class ZoneBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): form = forms.ZoneBulkDeleteForm default_redirect_url = 'dns:zone_list' + # # Records # + class RecordListView(ObjectListView): - queryset = Record.objects.all() - filter = filters.RecordFilter - filter_form = forms.RecordFilterForm - table = tables.RecordTable - edit_permissions = ['dns.change_record', 'dns.delete_record'] - template_name = 'dns/record_list.html' + queryset = Record.objects.all() + filter = filters.RecordFilter + filter_form = forms.RecordFilterForm + table = tables.RecordTable + edit_permissions = ['dns.change_record', 'dns.delete_record'] + template_name = 'dns/record_list.html' + def record(request, pk): - record = get_object_or_404(Record.objects.all(), pk=pk) - bind_export = record.to_bind() + record = get_object_or_404(Record.objects.all(), pk=pk) + bind_export = record.to_bind() + + return render(request, 'dns/record.html', { + 'record': record, + 'bind_export': bind_export, + }) - return render(request, 'dns/record.html', { - 'record': record, - 'bind_export': bind_export, - }) class RecordEditView(PermissionRequiredMixin, ObjectEditView): - permission_required = 'dns.change_record' - model = Record - form_class = forms.RecordForm - cancel_url = 'dns:record_list' + permission_required = 'dns.change_record' + model = Record + form_class = forms.RecordForm + cancel_url = 'dns:record_list' + class RecordDeleteView(PermissionRequiredMixin, ObjectDeleteView): - permission_required = 'dns.delete_record' - model = Record - redirect_url = 'dns:record_list' + permission_required = 'dns.delete_record' + model = Record + redirect_url = 'dns:record_list' + class RecordBulkImportView(PermissionRequiredMixin, BulkImportView): - permission_required = 'dns.add_record' - form = forms.RecordImportForm - table = tables.RecordTable - template_name = 'dns/record_import.html' - obj_list_url = 'dns:record_list' + permission_required = 'dns.add_record' + form = forms.RecordImportForm + table = tables.RecordTable + template_name = 'dns/record_import.html' + obj_list_url = 'dns:record_list' + class RecordBulkEditView(PermissionRequiredMixin, BulkEditView): - permission_required = 'dns.change_record' - cls = Record - form = forms.RecordBulkEditForm - template_name = 'dns/record_bulk_edit.html' - default_redirect_url = 'dns:record_list' + permission_required = 'dns.change_record' + cls = Record + form = forms.RecordBulkEditForm + template_name = 'dns/record_bulk_edit.html' + default_redirect_url = 'dns:record_list' + + def update_objects(self, pk_list, form): - def update_objects(self, pk_list, form): + fields_to_update = {} + for field in ['name', 'record_type', 'priority', 'zone', 'address', 'value']: + if form.cleaned_data[field]: + fields_to_update[field] = form.cleaned_data[field] - fields_to_update = {} - for field in ['name', 'record_type', 'priority', 'zone', 'address', 'value']: - if form.cleaned_data[field]: - fields_to_update[field] = form.cleaned_data[field] + rlist = self.cls.objects.filter(pk__in=pk_list) + if rlist: + rlist[0].save() + return rlist.update(**fields_to_update) - rlist = self.cls.objects.filter(pk__in=pk_list) - if rlist: - rlist[0].save() - return rlist.update(**fields_to_update) class RecordBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): - permission_required = 'dns.delete_record' - cls = Record - form = forms.RecordBulkEditForm - default_redirect_url = 'dns:record_list' + permission_required = 'dns.delete_record' + cls = Record + form = forms.RecordBulkEditForm + default_redirect_url = 'dns:record_list' + # # BIND Exports # + def bind_export(request, zones_list, context): - download = request.GET.get('download') - if download: - if download == 'all': - zbuf = StringIO.StringIO() - zfile = zipfile.ZipFile(zbuf, mode='w') - temp = [] - for z in zones_list: - temp.append(StringIO.StringIO()) - temp[len(temp)-1].write(z['content']) - zfile.writestr(z['id'],str(temp[len(temp)-1].getvalue())) - zfile.close() - response = HttpResponse( - zbuf.getvalue(), - content_type = 'application/zip' - ) - response['Content-Disposition'] = 'attachment; filename="netbox_dns_{}_{}.zip"'.format(context, str(int(time.time()))) - return response - else: - response = HttpResponse( - zones_list[int(download)]['content'], - content_type='text/plain' - ) - response['Content-Disposition'] = 'attachment; filename="{}"'.format(zones_list[int(download)]['id']) - return response - - else: - return render(request, 'dns/bind_export.html', { - 'context': context[0].upper() + context[1:], - 'zones': zones_list, - 'bind_export_count': len(zones_list), - }) + download = request.GET.get('download') + if download: + if download == 'all': + zbuf = StringIO.StringIO() + zfile = zipfile.ZipFile(zbuf, mode='w') + temp = [] + for z in zones_list: + temp.append(StringIO.StringIO()) + temp[len(temp) - 1].write(z['content']) + zfile.writestr(z['id'], str(temp[len(temp) - 1].getvalue())) + zfile.close() + response = HttpResponse( + zbuf.getvalue(), + content_type='application/zip' + ) + response['Content-Disposition'] = 'attachment; filename="netbox_dns_{}_{}.zip"'.format(context, str(int(time.time()))) + return response + else: + response = HttpResponse( + zones_list[int(download)]['content'], + content_type='text/plain' + ) + response['Content-Disposition'] = 'attachment; filename="{}"'.format(zones_list[int(download)]['id']) + return response + + else: + return render(request, 'dns/bind_export.html', { + 'context': context[0].upper() + context[1:], + 'zones': zones_list, + 'bind_export_count': len(zones_list), + }) + def full_forward(request): - return bind_export(request, export_bind_forward(), 'forward') + return bind_export(request, export_bind_forward(), 'forward') -def full_reverse(request): - return bind_export(request, export_bind_reverse(), 'reverse') +def full_reverse(request): + return bind_export(request, export_bind_reverse(), 'reverse') diff --git a/netbox/ipam/fixtures/ipam.json b/netbox/ipam/fixtures/ipam.json index db92ee9c906..36b5d6299a0 100644 --- a/netbox/ipam/fixtures/ipam.json +++ b/netbox/ipam/fixtures/ipam.json @@ -71,10 +71,10 @@ "soa_name": "", "soa_contact": "", "soa_serial": "", - "soa_refresh": "", - "soa_retry": "", - "soa_expire": "", - "soa_minimum": "" + "soa_refresh": null, + "soa_retry": null, + "soa_expire": null, + "soa_minimum": null } }, { diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index af67a555356..5c70ff80cfa 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -411,7 +411,6 @@ class Meta: model = IPAddress fields = ['address', 'vrf', 'tenant', 'ptr', 'device', 'interface_name', 'is_primary', 'description'] - def clean(self): device = self.cleaned_data.get('device') @@ -461,7 +460,6 @@ class IPAddressBulkEditForm(forms.Form, BootstrapMixin): description = forms.CharField(max_length=100, required=False) - def ipaddress_family_choices(): return [('', 'All'), (4, 'IPv4'), (6, 'IPv6')] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index d146fbc2a61..ffcceb0f984 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -13,7 +13,8 @@ from .fields import IPNetworkField, IPAddressField -import time, ipaddress +import time +import ipaddress import netaddr @@ -245,7 +246,7 @@ class Prefix(CreatedUpdatedModel): objects = PrefixQuerySet.as_manager() - #Reverse DNS + # Reverse DNS ttl = models.PositiveIntegerField(blank=True, null=True) soa_name = models.CharField(max_length=100, blank=True) soa_contact = models.CharField(max_length=100, blank=True) @@ -296,15 +297,15 @@ def update_serial(self): """ Each time a record or the zone is modified, the serial is incremented. """ - current_date = time.strftime('%Y%m%d',time.localtime()) + current_date = time.strftime('%Y%m%d', time.localtime()) if not self.soa_serial: - self.soa_serial = current_date+'01' + self.soa_serial = current_date + '01' else: serial_date = self.soa_serial[:8] serial_num = self.soa_serial[8:] - - if serial_date!=current_date: - self.soa_serial = current_date+'01' + + if serial_date != current_date: + self.soa_serial = current_date + '01' else: serial_num = int(serial_num) serial_num += 1 @@ -346,51 +347,51 @@ def new_subnet(self): def get_status_class(self): return STATUS_CHOICE_CLASSES[self.status] - def to_bind(self,ipaddresses): + def to_bind(self, ipaddresses): if self.bind_changed: self.update_serial() zones = {} - def header (zone_id): return '\n'.join([ - '; '+zone_id, - '; gen from prefix '+str(self.prefix)+' ('+(self.description if self.description else '')+') by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) ', - '', - '$TTL '+str(self.ttl), - self.soa_name.ljust(30)+' IN '+'SOA '+self.soa_contact+' (', - ' '+self.soa_serial.ljust(30)+' ; serial', - ' '+str(self.soa_refresh).ljust(30)+' ; refresh', - ' '+str(self.soa_retry).ljust(30)+' ; retry', - ' '+str(self.soa_expire).ljust(30)+' ; expire', - ' '+str(self.soa_minimum).ljust(29)+') ; minimum', - '', - '', - '', - '$ORIGIN '+zone_id, - '', - '', - ]) + def header(zone_id): + return '\n'.join([ + '; ' + zone_id, + '; gen from prefix ' + str(self.prefix) + ' (' + (self.description if self.description else '') + ') by netbox ( ' + time.strftime('%A %B %d %Y %H:%M:%S', time.localtime()) + ' ) ', + '', + '$TTL ' + str(self.ttl), + self.soa_name.ljust(30) + ' IN ' + 'SOA ' + self.soa_contact + ' (', + ' ' + self.soa_serial.ljust(30) + ' ; serial', + ' ' + str(self.soa_refresh).ljust(30) + ' ; refresh', + ' ' + str(self.soa_retry).ljust(30) + ' ; retry', + ' ' + str(self.soa_expire).ljust(30) + ' ; expire', + ' ' + str(self.soa_minimum).ljust(29) + ') ; minimum', + '', + '', + '', + '$ORIGIN ' + zone_id, + '', + '', + ]) if self.prefix.version == 4: pbytes = str(self.prefix).split('/')[0].split('.') pslash = int(str(self.prefix).split('/')[1]) if pslash > 16: - pbytes[3]='0' + pbytes[3] = '0' zslash = 24 - largerPrefix = Prefix.objects.filter(family=4, prefix__net_contains_or_equals=pbytes[0]+'.'+pbytes[1]+'.0.0/16') + largerPrefix = Prefix.objects.filter(family=4, prefix__net_contains_or_equals=pbytes[0] + '.' + pbytes[1] + '.0.0/16') if largerPrefix: - pbytes[2]='0' + pbytes[2] = '0' zslash = 16 else: - pbytes[2]='0' + pbytes[2] = '0' zslash = 16 - if pslash > zslash: pslash = zslash - p = IPNetwork(unicode('.'.join(pbytes)+'/'+str(pslash))) + p = IPNetwork(unicode('.'.join(pbytes) + '/' + str(pslash))) ipaddresses = IPAddress.objects.filter(family=4) for ip in ipaddresses: @@ -402,57 +403,53 @@ def header (zone_id): return '\n'.join([ if i in p: if zslash == 24: zone_id = ibytes[2] + '.' + ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.' - if not zone_id in zones: + if zone_id not in zones: zones[zone_id] = header(zone_id) - zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' + zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( ' + time.strftime('%A %B %d %Y %H:%M:%S', time.localtime()) + ' ) \n' else: - zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' - if not zone_id in zones: + zone_id = ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.' + if zone_id not in zones: zones[zone_id] = header(zone_id) - zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' - - + zones[zone_id] += (ibytes[3] + '.' + ibytes[2]).ljust(7) + ' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( ' + time.strftime('%A %B %d %Y %H:%M:%S', time.localtime()) + ' ) \n' else: pfull = str(ipaddress.IPv6Address(unicode(str(self.prefix).split('/')[0])).exploded) pnibbles = pfull.split(':') - pdigits = pfull.replace(':','') + pdigits = pfull.replace(':', '') pslash = int(str(self.prefix).split('/')[1]) - zslash = pslash if pslash % 16 == 0 else pslash/16+16 - pnibbles = pnibbles[:zslash/16] + ['0000'] * (8 - zslash/16) + zslash = pslash if pslash % 16 == 0 else pslash / 16 + 16 + pnibbles = pnibbles[:zslash / 16] + ['0000'] * (8 - zslash / 16) - largerPrefix = Prefix.objects.filter(family=6, prefix__net_contains_or_equals=':'.join(pnibbles)+'/'+str(zslash)) + largerPrefix = Prefix.objects.filter(family=6, prefix__net_contains_or_equals=':'.join(pnibbles) + '/' + str(zslash)) if largerPrefix: - #choper le plus grand minSlash = 128 for pp in largerPrefix: ppslash = int(str(pp.prefix).split('/')[1]) if ppslash < minSlash: minSlash = ppslash zslash = minSlash - pnibbles = pnibbles[:zslash/16] + ['0000'] * (8 - zslash/16) + pnibbles = pnibbles[:zslash / 16] + ['0000'] * (8 - zslash / 16) for ip in ipaddresses: if ip.ptr: ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) inibbles = ifull.split(':') - idigits = ifull.replace(':','')[::-1] + idigits = ifull.replace(':', '')[::-1] islash = int(str(ip.address).split('/')[1]) - pdigitszone = pdigits[:zslash/4][::-1] - zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' - if not zone_id in zones: + pdigitszone = pdigits[:zslash / 4][::-1] + zone_id = '.'.join(pdigitszone) + '.ip6.arpa.' + if zone_id not in zones: zones[zone_id] = header(zone_id) - zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' - + zones[zone_id] += ('.'.join(idigits[:32 - zslash / 4])).ljust(30) + ' IN PTR ' + ip.ptr.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( ' + time.strftime('%A %B %d %Y %H:%M:%S', time.localtime()) + ' ) \n' for z in zones: z += '\n\n; end ' ret = [] - for zid,zc in zones.items(): + for zid, zc in zones.items(): ret.append({ 'num': len(ret), 'id': zid, @@ -536,14 +533,14 @@ def update_dns(self): record_name = self.ptr[:-len(zone_name)] if record_name.endswith('.'): record_name = record_name[:-1] - record_type = 'A' if self.family==4 else 'AAAA' + record_type = 'A' if self.family == 4 else 'AAAA' dns.models.Record.objects.get_or_create( - name = record_name, - record_type = record_type, - zone = which_zone, - address = self - ) + name=record_name, + record_type=record_type, + zone=which_zone, + address=self + ) def to_csv(self): From d14b0ec52d0e056f3d5ea8213fcab7e3c52d2a74 Mon Sep 17 00:00:00 2001 From: rdujardin Date: Mon, 8 Aug 2016 12:18:07 +0200 Subject: [PATCH 39/42] Autocreate A/AAAA records if PTR is given a FQDN --- netbox/ipam/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index ffcceb0f984..3ed2cc2b45a 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -524,7 +524,7 @@ def update_dns(self): which_zone = None zones = dns.models.Zone.objects.all() for zone in zones: - if self.ptr.endswith(zone.name): + if self.ptr.endswith(zone.name) or self.ptr.endswith(zone.name + '.'): which_zone = zone break From 0fc5a2576d72a66bd416fa3193f2cfcda8bf919f Mon Sep 17 00:00:00 2001 From: rdujardin Date: Mon, 8 Aug 2016 18:34:51 +0200 Subject: [PATCH 40/42] Fix two bugs with A/AAAA auto-creating --- netbox/ipam/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 3ed2cc2b45a..b3f8dde752b 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -509,14 +509,14 @@ def clean(self): raise ValidationError("Duplicate IP address found in global table: {}".format(duplicate_ips.first())) def save(self, *args, **kwargs): - self.update_dns() if self.address: # Infer address family from IPAddress object self.family = self.address.version + super(IPAddress, self).save(*args, **kwargs) + self.update_dns() dns_records = dns.models.Record.objects.filter(address=self) for r in dns_records: r.save() - super(IPAddress, self).save(*args, **kwargs) def update_dns(self): """Auto-create a corresponding A/AAAA DNS record (if possible) whenever the PTR field is modified""" @@ -530,7 +530,7 @@ def update_dns(self): if which_zone: zone_name = which_zone.name - record_name = self.ptr[:-len(zone_name)] + record_name = self.ptr[:-len(zone_name)] if not self.ptr.endswith('.') else self.ptr[:-len(zone_name) - 1] if record_name.endswith('.'): record_name = record_name[:-1] record_type = 'A' if self.family == 4 else 'AAAA' From 339fcdc541262eb2b09335f1310e400b0684391f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Dujardin?= Date: Fri, 12 Aug 2016 14:59:31 +0200 Subject: [PATCH 41/42] Fix bug with prefixes CSV exporting --- netbox/ipam/models.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index b3f8dde752b..e82126beb30 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -323,14 +323,14 @@ def to_csv(self): self.get_status_display(), self.role.name if self.role else '', self.description, - self.ttl if self.ttl else '', + str(self.ttl) if self.ttl else '', self.soa_name if self.soa_name else '', self.soa_contact if self.soa_contact else '', self.soa_serial if self.soa_serial else '', - self.soa_refresh if self.soa_refresh else '', - self.soa_retry if self.soa_retry else '', - self.soa_expire if self.soa_expire else '', - self.soa_minimum if self.soa_minimum else '', + str(self.soa_refresh) if self.soa_refresh else '', + str(self.soa_retry) if self.soa_retry else '', + str(self.soa_expire) if self.soa_expire else '', + str(self.soa_minimum) if self.soa_minimum else '', ]) @property From c86a74ec30bf0ace77f88b3ccf0d41e076df3b2b Mon Sep 17 00:00:00 2001 From: rdujardin Date: Thu, 18 Aug 2016 17:55:37 +0200 Subject: [PATCH 42/42] Add 'extra_conf' field to DNS zones and reverse DNS zones (i.e. prefixes) --- netbox/dns/api/serializers.py | 2 +- netbox/dns/forms.py | 12 ++++++++--- netbox/dns/migrations/0006_zone_extra_conf.py | 20 +++++++++++++++++++ netbox/dns/models.py | 8 ++++++-- netbox/dns/views.py | 8 +++++--- netbox/ipam/api/serializers.py | 2 +- netbox/ipam/forms.py | 12 ++++++++--- .../ipam/migrations/0011_prefix_extra_conf.py | 20 +++++++++++++++++++ netbox/ipam/models.py | 2 ++ netbox/ipam/views.py | 2 +- netbox/templates/dns/bind_export.html | 1 + netbox/templates/dns/zone.html | 10 ++++++++++ netbox/templates/dns/zone_bulk_edit.html | 1 + netbox/templates/dns/zone_import.html | 7 ++++++- netbox/templates/ipam/prefix.html | 4 ++++ netbox/templates/ipam/prefix_bulk_edit.html | 1 + netbox/templates/ipam/prefix_import.html | 7 ++++++- 17 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 netbox/dns/migrations/0006_zone_extra_conf.py create mode 100644 netbox/ipam/migrations/0011_prefix_extra_conf.py diff --git a/netbox/dns/api/serializers.py b/netbox/dns/api/serializers.py index 504827301af..cf7a378a304 100644 --- a/netbox/dns/api/serializers.py +++ b/netbox/dns/api/serializers.py @@ -12,7 +12,7 @@ class ZoneSerializer(serializers.ModelSerializer): class Meta: model = Zone - fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + fields = ['id', 'name', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf', 'description'] class ZoneNestedSerializer(ZoneSerializer): diff --git a/netbox/dns/forms.py b/netbox/dns/forms.py index 06ee4256213..d8ffa972c07 100644 --- a/netbox/dns/forms.py +++ b/netbox/dns/forms.py @@ -3,7 +3,7 @@ from ipam.models import IPAddress from utilities.forms import ( - BootstrapMixin, ConfirmationForm, APISelect, Livesearch, CSVDataField, BulkImportForm, + BootstrapMixin, ConfirmationForm, APISelect, Livesearch, CSVDataField, BulkImportForm, SmallTextarea ) from .models import ( @@ -22,7 +22,7 @@ class ZoneForm(forms.ModelForm, BootstrapMixin): class Meta: model = Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf', 'description'] labels = { 'soa_name': 'SOA Name', 'soa_contact': 'SOA Contact', @@ -30,6 +30,7 @@ class Meta: 'soa_retry': 'SOA Retry', 'soa_expire': 'SOA Expire', 'soa_minimum': 'SOA Minimum', + 'extra_conf': 'Extra Conf', 'description': 'Description', } help_texts = { @@ -40,6 +41,10 @@ class Meta: 'soa_retry': "Retry time, in seconds", 'soa_expire': "Expire time, in seconds", 'soa_minimum': "Negative result TTL, in seconds", + 'extra_conf': "Extra conf related to the zone, to put in your DNS server main conf file", + } + widgets = { + 'extra_conf': SmallTextarea(attrs={'rows': 3}), } @@ -47,7 +52,7 @@ class ZoneFromCSVForm(forms.ModelForm): class Meta: model = Zone - fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'description'] + fields = ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf', 'description'] class ZoneImportForm(BulkImportForm, BootstrapMixin): @@ -64,6 +69,7 @@ class ZoneBulkEditForm(forms.Form, BootstrapMixin): soa_retry = forms.IntegerField(required=False, label='SOA Retry') soa_expire = forms.IntegerField(required=False, label='SOA Expire') soa_minimum = forms.IntegerField(required=False, label='SOA Minimum') + extra_conf = forms.CharField(max_length=500, required=False, widget=SmallTextarea(attrs={'rows': 3}), label='Extra Conf') description = forms.CharField(max_length=100, required=False, label='Description') diff --git a/netbox/dns/migrations/0006_zone_extra_conf.py b/netbox/dns/migrations/0006_zone_extra_conf.py new file mode 100644 index 00000000000..b65d72404c9 --- /dev/null +++ b/netbox/dns/migrations/0006_zone_extra_conf.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-18 14:55 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dns', '0005_auto_20160728_0854'), + ] + + operations = [ + migrations.AddField( + model_name='zone', + name='extra_conf', + field=models.CharField(blank=True, max_length=500), + ), + ] diff --git a/netbox/dns/models.py b/netbox/dns/models.py index 61fd417f7c1..74e4921b922 100644 --- a/netbox/dns/models.py +++ b/netbox/dns/models.py @@ -30,6 +30,7 @@ class Zone(CreatedUpdatedModel): soa_retry = models.PositiveIntegerField() soa_expire = models.PositiveIntegerField() soa_minimum = models.PositiveIntegerField() + extra_conf = models.CharField(max_length=500, blank=True) description = models.CharField(max_length=100, blank=True) class Meta: @@ -82,6 +83,7 @@ def to_csv(self): str(self.soa_retry), str(self.soa_expire), str(self.soa_minimum), + '"{}"'.format(self.extra_conf) if self.extra_conf else '', self.description, ]) @@ -185,6 +187,7 @@ def export_bind_forward(): zones_list.append({ 'num': len(zones_list), 'id': z.name, + 'extra_conf': z.extra_conf, 'content': z.to_bind(records) }) @@ -201,14 +204,15 @@ def export_bind_reverse(): z = p.to_bind(child_ip) for zz in z: if not zz['id'] in zones: - zones[zz['id']] = zz['content'] + zones[zz['id']] = (zz['content'], p.extra_conf) zones_list = [] for zid, zc in zones.items(): zones_list.append({ 'num': len(zones_list), 'id': zid, - 'content': zc, + 'content': zc[0], + 'extra_conf': zc[1], }) return zones_list diff --git a/netbox/dns/views.py b/netbox/dns/views.py index 7e3ec14923d..8a1f84d25ac 100644 --- a/netbox/dns/views.py +++ b/netbox/dns/views.py @@ -40,8 +40,7 @@ def zone(request, pk): record_count = len(records) # DNS records - dns_records = Record.objects.filter(zone=zone) - dns_records_table = RecordZoneTable(dns_records) + dns_records_table = RecordZoneTable(records) return render(request, 'dns/zone.html', { 'zone': zone, @@ -82,7 +81,7 @@ class ZoneBulkEditView(PermissionRequiredMixin, BulkEditView): def update_objects(self, pk_list, form): fields_to_update = {} - for field in ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum']: + for field in ['name', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf']: if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] @@ -184,10 +183,13 @@ def bind_export(request, zones_list, context): zbuf = StringIO.StringIO() zfile = zipfile.ZipFile(zbuf, mode='w') temp = [] + cf = '' for z in zones_list: temp.append(StringIO.StringIO()) temp[len(temp) - 1].write(z['content']) zfile.writestr(z['id'], str(temp[len(temp) - 1].getvalue())) + cf += '{}:\n\t{}\n'.format(z['id'], z['extra_conf'] if z['extra_conf'] else '') + zfile.writestr('extra_confs.txt', cf) zfile.close() response = HttpResponse( zbuf.getvalue(), diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index e5b089b1e04..3b58245c391 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -136,7 +136,7 @@ class PrefixSerializer(serializers.ModelSerializer): class Meta: model = Prefix - fields = ['id', 'family', 'prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + fields = ['id', 'family', 'prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_serial', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf'] class PrefixNestedSerializer(PrefixSerializer): diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 73d7de604b2..6fcf921cbac 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -6,7 +6,7 @@ from dcim.models import Site, Device, Interface from tenancy.forms import bulkedit_tenant_choices from tenancy.models import Tenant -from utilities.forms import BootstrapMixin, APISelect, Livesearch, CSVDataField, BulkImportForm, SlugField +from utilities.forms import BootstrapMixin, APISelect, Livesearch, CSVDataField, BulkImportForm, SlugField, SmallTextarea from .models import ( Aggregate, IPAddress, Prefix, PREFIX_STATUS_CHOICES, RIR, Role, VLAN, VLANGroup, VLAN_STATUS_CHOICES, VRF, @@ -158,7 +158,7 @@ class PrefixForm(forms.ModelForm, BootstrapMixin): class Meta: model = Prefix - fields = ['prefix', 'vrf', 'tenant', 'site', 'vlan', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + fields = ['prefix', 'vrf', 'tenant', 'site', 'vlan', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf'] labels = { 'ttl': 'Rev. DNS - TTL', 'soa_name': 'Rev. DNS - SOA Name', @@ -167,6 +167,7 @@ class Meta: 'soa_retry': 'Rev. DNS - SOA Retry', 'soa_expire': 'Rev. DNS - SOA Expire', 'soa_minimum': 'Rev. DNS - SOA Minimum', + 'extra_conf': 'Rev. DNS - Extra Conf', } help_texts = { 'prefix': "IPv4 or IPv6 network", @@ -182,6 +183,10 @@ class Meta: 'soa_retry': "Retry time, in seconds", 'soa_expire': "Expire time, in seconds", 'soa_minimum': "Negative result TTL, in seconds", + 'extra_conf': "Extra conf related to the zone, to put in your DNS server main conf file", + } + widgets = { + 'extra_conf': SmallTextarea(attrs={'rows': 3}), } def __init__(self, *args, **kwargs): @@ -228,7 +233,7 @@ class PrefixFromCSVForm(forms.ModelForm): class Meta: model = Prefix fields = ['prefix', 'vrf', 'tenant', 'site', 'vlan_group_name', 'vlan_vid', 'status_name', 'role', - 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum'] + 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf'] def clean(self): @@ -287,6 +292,7 @@ class PrefixBulkEditForm(forms.Form, BootstrapMixin): soa_retry = forms.IntegerField(required=False, label='Reverse DNS - SOA Retry') soa_expire = forms.IntegerField(required=False, label='Reverse DNS - SOA Expire') soa_minimum = forms.IntegerField(required=False, label='Reverse DNS - SOA Minimum') + extra_conf = forms.CharField(max_length=500, required=False, label='Reverse DNS - Extra Conf', widget=SmallTextarea(attrs={'rows': 3})) def prefix_vrf_choices(): diff --git a/netbox/ipam/migrations/0011_prefix_extra_conf.py b/netbox/ipam/migrations/0011_prefix_extra_conf.py new file mode 100644 index 00000000000..c17225637e8 --- /dev/null +++ b/netbox/ipam/migrations/0011_prefix_extra_conf.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-18 14:55 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0010_merge'), + ] + + operations = [ + migrations.AddField( + model_name='prefix', + name='extra_conf', + field=models.CharField(blank=True, max_length=500), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index e82126beb30..a23f60f296f 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -259,6 +259,7 @@ class Prefix(CreatedUpdatedModel): soa_expire = models.PositiveIntegerField(blank=True, null=True) soa_minimum = models.PositiveIntegerField(blank=True, null=True) + extra_conf = models.CharField(max_length=500, blank=True) description = models.CharField(max_length=100, blank=True) class Meta: @@ -331,6 +332,7 @@ def to_csv(self): str(self.soa_retry) if self.soa_retry else '', str(self.soa_expire) if self.soa_expire else '', str(self.soa_minimum) if self.soa_minimum else '', + '"{}"'.format(self.extra_conf) if self.extra_conf else '', ]) @property diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index ee129b50a17..9408f691186 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -409,7 +409,7 @@ def update_objects(self, pk_list, form): fields_to_update[field] = None elif form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] - for field in ['site', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum']: + for field in ['site', 'status', 'role', 'description', 'ttl', 'soa_name', 'soa_contact', 'soa_refresh', 'soa_retry', 'soa_expire', 'soa_minimum', 'extra_conf']: if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] diff --git a/netbox/templates/dns/bind_export.html b/netbox/templates/dns/bind_export.html index 4784d46a92a..4a5cc6303de 100644 --- a/netbox/templates/dns/bind_export.html +++ b/netbox/templates/dns/bind_export.html @@ -33,6 +33,7 @@

    BIND Export {{context}}

    {{ z.content }}
    {{ z.extra_conf }}
    {% endfor %} diff --git a/netbox/templates/dns/zone.html b/netbox/templates/dns/zone.html index 457b0eee428..c296ca241a5 100644 --- a/netbox/templates/dns/zone.html +++ b/netbox/templates/dns/zone.html @@ -86,6 +86,16 @@

    {{ zone }}

    		SOA Minimum {{ zone.soa_minimum }}
    Extra Conf + {% if zone.extra_conf %} + {{ zone.extra_conf }} + {% else %} + - + {% endif %} +
    Description diff --git a/netbox/templates/dns/zone_bulk_edit.html b/netbox/templates/dns/zone_bulk_edit.html index 6d61fc60aaf..0d3410539bf 100644 --- a/netbox/templates/dns/zone_bulk_edit.html +++ b/netbox/templates/dns/zone_bulk_edit.html @@ -14,6 +14,7 @@ {{ zone.soa_retry }} {{ zone.soa_expire }} {{ zone.soa_minimum }}{{ zone.extra_conf }} {{ zone.description }}
    Negative result TTL, in seconds 1800
    Extra ConfExtra conf related to the zone, to put in your DNS server main conf file"notify: 10.120.0.1 NOKEY\nprovide-xfr: 10.120.0.1 NOKEY"
    Description Description (optional)

    Example

    - 
    foo.net,10800,@,ns.foo.net. noc.foo.net.,3600,3600,604800,1800,Mail servers zone
    + 
    foo.net,10800,@,ns.foo.net. noc.foo.net.,3600,3600,604800,1800,"notify: 10.120.0.1 NOKEY\nprovide-xfr: 10.120.0.1 NOKEY",Mail servers zone
    {% endblock %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 0a37b65c00c..e2db6636a89 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -131,6 +131,10 @@

    		Reverse DNS - SOA Minimum {{ prefix.soa_minimum }}
    Reverse DNS - Extra Conf{{ prefix.extra_conf }}
    Created {{ prefix.created }}{{ prefix.soa_expire }} {{ prefix.soa_minimum }} {{ prefix.description }}{{ prefix.extra_conf }}
    Negative result TTL, in seconds 1800
    Reverse DNS - Extra ConfExtra conf related to the zone, to put in your DNS server main conf file"notify: 10.120.0.1 NOKEY\nprovide-xfr: 10.120.0.1 NOKEY"

    Example

    - 
    192.168.42.0/24,65000:123,ABC01,HQ,Customers,801,Active,Customer,7th floor WiFi,10800,@,ns.foo.net. noc.foo.net.,3600,3600,604800,1800
    + 
    192.168.42.0/24,65000:123,ABC01,HQ,Customers,801,Active,Customer,7th floor WiFi,10800,@,ns.foo.net. noc.foo.net.,3600,3600,604800,1800,"notify: 10.120.0.1 NOKEY\nprovide-xfr: 10.120.0.1 NOKEY"
    {% endblock %}