From cbd7b5b4c38cf0177c46f70c42509b15efdbbbfe Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 22 Jun 2016 14:23:06 -0400 Subject: [PATCH] Squashed migrations in preparation for public release --- netbox/circuits/migrations/0001_initial.py | 36 +++------ .../migrations/0002_auto_20160620_1929.py | 25 ------ .../migrations/0002_auto_20160622_1821.py | 43 +++++++++++ .../migrations/0003_auto_20160621_1728.py | 25 ------ .../migrations/0004_auto_20160622_1410.py | 40 ---------- netbox/dcim/migrations/0001_initial.py | 21 +++-- ...227_0235.py => 0002_auto_20160622_1821.py} | 4 +- .../migrations/0003_auto_20160304_1642.py | 30 -------- .../migrations/0004_auto_20160328_2109.py | 29 ------- .../migrations/0005_auto_20160328_2135.py | 19 ----- .../migrations/0006_remove_device_ro_snmp.py | 19 ----- .../dcim/migrations/0007_module_discovered.py | 20 ----- .../migrations/0008_auto_20160621_1843.py | 20 ----- .../migrations/0009_auto_20160622_1408.py | 52 ------------- netbox/extras/migrations/0001_initial.py | 34 ++++++++- netbox/extras/migrations/0002_topologymap.py | 31 -------- .../migrations/0003_auto_20160412_1332.py | 20 ----- netbox/extras/migrations/0004_useraction.py | 34 --------- .../migrations/0005_auto_20160524_1324.py | 22 ------ netbox/ipam/migrations/0001_initial.py | 34 ++++----- .../migrations/0002_auto_20160517_2007.py | 25 ------ .../migrations/0003_auto_20160517_2026.py | 25 ------ .../migrations/0004_auto_20160517_2044.py | 23 ------ netbox/ipam/migrations/0005_delete_status.py | 18 ----- .../migrations/0006_auto_20160622_1413.py | 76 ------------------- netbox/secrets/migrations/0001_initial.py | 25 +++--- .../migrations/0002_auto_20160321_1448.py | 31 -------- .../migrations/0003_auto_20160321_1524.py | 19 ----- .../migrations/0004_auto_20160407_1548.py | 32 -------- .../migrations/0005_auto_20160614_2019.py | 19 ----- .../migrations/0006_auto_20160622_1501.py | 25 ------ .../migrations/0007_auto_20160622_1507.py | 35 --------- netbox/users/migrations/0001_initial.py | 14 ---- netbox/users/migrations/__init__.py | 0 netbox/utilities/migrations/0001_initial.py | 14 ---- netbox/utilities/migrations/__init__.py | 0 36 files changed, 129 insertions(+), 810 deletions(-) delete mode 100644 netbox/circuits/migrations/0002_auto_20160620_1929.py create mode 100644 netbox/circuits/migrations/0002_auto_20160622_1821.py delete mode 100644 netbox/circuits/migrations/0003_auto_20160621_1728.py delete mode 100644 netbox/circuits/migrations/0004_auto_20160622_1410.py rename netbox/dcim/migrations/{0002_auto_20160227_0235.py => 0002_auto_20160622_1821.py} (97%) delete mode 100644 netbox/dcim/migrations/0003_auto_20160304_1642.py delete mode 100644 netbox/dcim/migrations/0004_auto_20160328_2109.py delete mode 100644 netbox/dcim/migrations/0005_auto_20160328_2135.py delete mode 100644 netbox/dcim/migrations/0006_remove_device_ro_snmp.py delete mode 100644 netbox/dcim/migrations/0007_module_discovered.py delete mode 100644 netbox/dcim/migrations/0008_auto_20160621_1843.py delete mode 100644 netbox/dcim/migrations/0009_auto_20160622_1408.py delete mode 100644 netbox/extras/migrations/0002_topologymap.py delete mode 100644 netbox/extras/migrations/0003_auto_20160412_1332.py delete mode 100644 netbox/extras/migrations/0004_useraction.py delete mode 100644 netbox/extras/migrations/0005_auto_20160524_1324.py delete mode 100644 netbox/ipam/migrations/0002_auto_20160517_2007.py delete mode 100644 netbox/ipam/migrations/0003_auto_20160517_2026.py delete mode 100644 netbox/ipam/migrations/0004_auto_20160517_2044.py delete mode 100644 netbox/ipam/migrations/0005_delete_status.py delete mode 100644 netbox/ipam/migrations/0006_auto_20160622_1413.py delete mode 100644 netbox/secrets/migrations/0002_auto_20160321_1448.py delete mode 100644 netbox/secrets/migrations/0003_auto_20160321_1524.py delete mode 100644 netbox/secrets/migrations/0004_auto_20160407_1548.py delete mode 100644 netbox/secrets/migrations/0005_auto_20160614_2019.py delete mode 100644 netbox/secrets/migrations/0006_auto_20160622_1501.py delete mode 100644 netbox/secrets/migrations/0007_auto_20160622_1507.py delete mode 100644 netbox/users/migrations/0001_initial.py delete mode 100644 netbox/users/migrations/__init__.py delete mode 100644 netbox/utilities/migrations/0001_initial.py delete mode 100644 netbox/utilities/migrations/__init__.py diff --git a/netbox/circuits/migrations/0001_initial.py b/netbox/circuits/migrations/0001_initial.py index 8136eac9a..470fbee46 100644 --- a/netbox/circuits/migrations/0001_initial.py +++ b/netbox/circuits/migrations/0001_initial.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-27 02:35 +# Generated by Django 1.9.7 on 2016-06-22 18:21 from __future__ import unicode_literals from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -11,7 +10,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('dcim', '__first__'), ] operations = [ @@ -19,14 +17,15 @@ class Migration(migrations.Migration): name='Circuit', 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)), ('cid', models.CharField(max_length=50, verbose_name=b'Circuit ID')), ('install_date', models.DateField(blank=True, null=True, verbose_name=b'Date installed')), - ('port_speed', models.PositiveSmallIntegerField(choices=[[100, b'100 Mbps'], [1000, b'1 Gbps'], [10000, b'10 Gbps'], [25000, b'25 Gbps'], [40000, b'40 Gbps'], [50000, b'50 Gbps'], [100000, b'100 Gbps']], verbose_name=b'Port speed')), - ('commit_rate', models.PositiveIntegerField(blank=True, null=True, verbose_name=b'Commit rate (Mbps)')), + ('port_speed', models.PositiveIntegerField(verbose_name=b'Port speed (Kbps)')), + ('commit_rate', models.PositiveIntegerField(blank=True, null=True, verbose_name=b'Commit rate (Kbps)')), ('xconnect_id', models.CharField(blank=True, max_length=50, verbose_name=b'Cross-connect ID')), ('pp_info', models.CharField(blank=True, max_length=100, verbose_name=b'Patch panel/port(s)')), ('comments', models.TextField(blank=True)), - ('interface', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='circuit', to='dcim.Interface')), ], options={ 'ordering': ['provider', 'cid'], @@ -47,36 +46,19 @@ class Migration(migrations.Migration): name='Provider', 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=50, unique=True)), ('slug', models.SlugField(unique=True)), ('asn', models.PositiveIntegerField(blank=True, null=True, verbose_name=b'ASN')), ('account', models.CharField(blank=True, max_length=30, verbose_name=b'Account number')), ('portal_url', models.URLField(blank=True, verbose_name=b'Portal')), - ('noc_contact', models.TextField(blank=True, verbose_name=b'NOC Contact')), - ('admin_contact', models.TextField(blank=True, verbose_name=b'Admin Contact')), + ('noc_contact', models.TextField(blank=True, verbose_name=b'NOC contact')), + ('admin_contact', models.TextField(blank=True, verbose_name=b'Admin contact')), ('comments', models.TextField(blank=True)), ], options={ 'ordering': ['name'], }, ), - migrations.AddField( - model_name='circuit', - name='provider', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.Provider'), - ), - migrations.AddField( - model_name='circuit', - name='site', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='dcim.Site'), - ), - migrations.AddField( - model_name='circuit', - name='type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.CircuitType'), - ), - migrations.AlterUniqueTogether( - name='circuit', - unique_together=set([('provider', 'cid')]), - ), ] diff --git a/netbox/circuits/migrations/0002_auto_20160620_1929.py b/netbox/circuits/migrations/0002_auto_20160620_1929.py deleted file mode 100644 index cf63d7251..000000000 --- a/netbox/circuits/migrations/0002_auto_20160620_1929.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-20 19:29 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('circuits', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='circuit', - name='commit_rate', - field=models.PositiveIntegerField(blank=True, null=True, verbose_name=b'Commit rate (Kbps)'), - ), - migrations.AlterField( - model_name='circuit', - name='port_speed', - field=models.PositiveIntegerField(verbose_name=b'Port speed (Kbps)'), - ), - ] diff --git a/netbox/circuits/migrations/0002_auto_20160622_1821.py b/netbox/circuits/migrations/0002_auto_20160622_1821.py new file mode 100644 index 000000000..32f31b376 --- /dev/null +++ b/netbox/circuits/migrations/0002_auto_20160622_1821.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-06-22 18:21 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('dcim', '0001_initial'), + ('circuits', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='circuit', + name='interface', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='circuit', to='dcim.Interface'), + ), + migrations.AddField( + model_name='circuit', + name='provider', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.Provider'), + ), + migrations.AddField( + model_name='circuit', + name='site', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='dcim.Site'), + ), + migrations.AddField( + model_name='circuit', + name='type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.CircuitType'), + ), + migrations.AlterUniqueTogether( + name='circuit', + unique_together=set([('provider', 'cid')]), + ), + ] diff --git a/netbox/circuits/migrations/0003_auto_20160621_1728.py b/netbox/circuits/migrations/0003_auto_20160621_1728.py deleted file mode 100644 index a8b64f70a..000000000 --- a/netbox/circuits/migrations/0003_auto_20160621_1728.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-21 17:28 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('circuits', '0002_auto_20160620_1929'), - ] - - operations = [ - migrations.AlterField( - model_name='provider', - name='admin_contact', - field=models.TextField(blank=True, verbose_name=b'Admin contact'), - ), - migrations.AlterField( - model_name='provider', - name='noc_contact', - field=models.TextField(blank=True, verbose_name=b'NOC contact'), - ), - ] diff --git a/netbox/circuits/migrations/0004_auto_20160622_1410.py b/netbox/circuits/migrations/0004_auto_20160622_1410.py deleted file mode 100644 index 292e993cf..000000000 --- a/netbox/circuits/migrations/0004_auto_20160622_1410.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-22 14:10 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('circuits', '0003_auto_20160621_1728'), - ] - - operations = [ - migrations.AddField( - model_name='circuit', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='circuit', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 10, 28, 340517)), - preserve_default=False, - ), - migrations.AddField( - model_name='provider', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='provider', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 10, 40, 964944)), - preserve_default=False, - ), - ] diff --git a/netbox/dcim/migrations/0001_initial.py b/netbox/dcim/migrations/0001_initial.py index c1766d58d..da18bdbfe 100644 --- a/netbox/dcim/migrations/0001_initial.py +++ b/netbox/dcim/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-27 02:35 +# Generated by Django 1.9.7 on 2016-06-22 18:21 from __future__ import unicode_literals import django.core.validators @@ -58,12 +58,13 @@ class Migration(migrations.Migration): name='Device', 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', utilities.fields.NullableCharField(blank=True, max_length=50, null=True, unique=True)), ('serial', models.CharField(blank=True, max_length=50, verbose_name=b'Serial number')), ('position', models.PositiveSmallIntegerField(blank=True, help_text=b'Number of the lowest U position occupied by the device', null=True, validators=[django.core.validators.MinValueValidator(1)], verbose_name=b'Position (U)')), ('face', models.PositiveSmallIntegerField(blank=True, choices=[[0, b'Front'], [1, b'Rear']], null=True, verbose_name=b'Rack face')), ('status', models.BooleanField(choices=[[True, b'Active'], [False, b'Offline']], default=True, verbose_name=b'Status')), - ('ro_snmp', models.CharField(blank=True, max_length=50, verbose_name=b'SNMP (RO)')), ('comments', models.TextField(blank=True)), ], options={ @@ -90,9 +91,9 @@ class Migration(migrations.Migration): ('slug', models.SlugField()), ('u_height', models.PositiveSmallIntegerField(default=1, verbose_name=b'Height (U)')), ('is_full_depth', models.BooleanField(default=True, help_text=b'Device consumes both front and rear rack faces', verbose_name=b'Is full depth')), - ('is_console_server', models.BooleanField(default=False, help_text=b'Include this type of device in lists of console servers', verbose_name=b'Is a console server')), - ('is_pdu', models.BooleanField(default=False, help_text=b'Include this type of device in lists of PDUs', verbose_name=b'Is a PDU')), - ('is_network_device', models.BooleanField(default=True, help_text=b'This is a network device (e.g. switch, router, etc.)', verbose_name=b'Is a network device')), + ('is_console_server', models.BooleanField(default=False, help_text=b'This type of device has console server ports', verbose_name=b'Is a console server')), + ('is_pdu', models.BooleanField(default=False, help_text=b'This type of device has power outlets', verbose_name=b'Is a PDU')), + ('is_network_device', models.BooleanField(default=True, help_text=b'This type of device has network interfaces', verbose_name=b'Is a network device')), ], options={ 'ordering': ['manufacturer', 'model'], @@ -104,7 +105,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=30)), ('form_factor', models.PositiveSmallIntegerField(choices=[[0, b'Virtual'], [800, b'10/100M (Copper)'], [1000, b'1GE (Copper)'], [1100, b'1GE (SFP)'], [1200, b'10GE (SFP+)'], [1300, b'10GE (XFP)'], [1400, b'40GE (QSFP+)']], default=1200)), - ('mgmt_only', models.BooleanField(default=False, verbose_name=b'OOB Management')), + ('mgmt_only', models.BooleanField(default=False, help_text=b'This interface is used only for out-of-band management', verbose_name=b'OOB Management')), ('description', models.CharField(blank=True, max_length=100)), ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='dcim.Device')), ], @@ -152,10 +153,12 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=50, verbose_name=b'Name')), ('part_id', models.CharField(blank=True, max_length=50, verbose_name=b'Part ID')), ('serial', models.CharField(blank=True, max_length=50, verbose_name=b'Serial number')), + ('discovered', models.BooleanField(default=False, verbose_name=b'Discovered')), ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='modules', to='dcim.Device')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submodules', to='dcim.Module')), ], options={ - 'ordering': ['device', 'name'], + 'ordering': ['device__id', 'parent__id', 'name'], }, ), migrations.CreateModel( @@ -217,6 +220,8 @@ class Migration(migrations.Migration): name='Rack', 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=50)), ('facility_id', utilities.fields.NullableCharField(blank=True, max_length=30, null=True, verbose_name=b'Facility ID')), ('u_height', models.PositiveSmallIntegerField(default=42, verbose_name=b'Height (U)')), @@ -241,6 +246,8 @@ class Migration(migrations.Migration): name='Site', 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=50, unique=True)), ('slug', models.SlugField(unique=True)), ('facility', models.CharField(blank=True, max_length=50)), diff --git a/netbox/dcim/migrations/0002_auto_20160227_0235.py b/netbox/dcim/migrations/0002_auto_20160622_1821.py similarity index 97% rename from netbox/dcim/migrations/0002_auto_20160227_0235.py rename to netbox/dcim/migrations/0002_auto_20160622_1821.py index 2cb19dc5f..e269d43f4 100644 --- a/netbox/dcim/migrations/0002_auto_20160227_0235.py +++ b/netbox/dcim/migrations/0002_auto_20160622_1821.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-27 02:35 +# Generated by Django 1.9.7 on 2016-06-22 18:21 from __future__ import unicode_literals from django.db import migrations, models @@ -77,7 +77,7 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='module', - unique_together=set([('device', 'name')]), + unique_together=set([('device', 'parent', 'name')]), ), migrations.AlterUniqueTogether( name='interfacetemplate', diff --git a/netbox/dcim/migrations/0003_auto_20160304_1642.py b/netbox/dcim/migrations/0003_auto_20160304_1642.py deleted file mode 100644 index 659f77013..000000000 --- a/netbox/dcim/migrations/0003_auto_20160304_1642.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-03-04 16:42 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0002_auto_20160227_0235'), - ] - - operations = [ - migrations.AlterField( - model_name='devicetype', - name='is_console_server', - field=models.BooleanField(default=False, help_text=b'This type of device has console server ports', verbose_name=b'Is a console server'), - ), - migrations.AlterField( - model_name='devicetype', - name='is_network_device', - field=models.BooleanField(default=True, help_text=b'This type of device has network interfaces', verbose_name=b'Is a network device'), - ), - migrations.AlterField( - model_name='devicetype', - name='is_pdu', - field=models.BooleanField(default=False, help_text=b'This type of device has power outlets', verbose_name=b'Is a PDU'), - ), - ] diff --git a/netbox/dcim/migrations/0004_auto_20160328_2109.py b/netbox/dcim/migrations/0004_auto_20160328_2109.py deleted file mode 100644 index 7928e6586..000000000 --- a/netbox/dcim/migrations/0004_auto_20160328_2109.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-03-28 21:09 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0003_auto_20160304_1642'), - ] - - operations = [ - migrations.AlterModelOptions( - name='module', - options={'ordering': ['device', 'parent', 'name']}, - ), - migrations.AddField( - model_name='module', - name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submodules', to='dcim.Module'), - ), - migrations.AlterUniqueTogether( - name='module', - unique_together=set([('device', 'parent', 'name')]), - ), - ] diff --git a/netbox/dcim/migrations/0005_auto_20160328_2135.py b/netbox/dcim/migrations/0005_auto_20160328_2135.py deleted file mode 100644 index eaf465bd4..000000000 --- a/netbox/dcim/migrations/0005_auto_20160328_2135.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-03-28 21:35 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0004_auto_20160328_2109'), - ] - - operations = [ - migrations.AlterModelOptions( - name='module', - options={'ordering': ['device__id', 'parent__id', 'name']}, - ), - ] diff --git a/netbox/dcim/migrations/0006_remove_device_ro_snmp.py b/netbox/dcim/migrations/0006_remove_device_ro_snmp.py deleted file mode 100644 index 519bc4e49..000000000 --- a/netbox/dcim/migrations/0006_remove_device_ro_snmp.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-19 15:19 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0005_auto_20160328_2135'), - ] - - operations = [ - migrations.RemoveField( - model_name='device', - name='ro_snmp', - ), - ] diff --git a/netbox/dcim/migrations/0007_module_discovered.py b/netbox/dcim/migrations/0007_module_discovered.py deleted file mode 100644 index df3417fa3..000000000 --- a/netbox/dcim/migrations/0007_module_discovered.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-15 16:31 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0006_remove_device_ro_snmp'), - ] - - operations = [ - migrations.AddField( - model_name='module', - name='discovered', - field=models.BooleanField(default=False, verbose_name=b'Discovered'), - ), - ] diff --git a/netbox/dcim/migrations/0008_auto_20160621_1843.py b/netbox/dcim/migrations/0008_auto_20160621_1843.py deleted file mode 100644 index 3975b2b5c..000000000 --- a/netbox/dcim/migrations/0008_auto_20160621_1843.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-21 18:43 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0007_module_discovered'), - ] - - operations = [ - migrations.AlterField( - model_name='interface', - name='mgmt_only', - field=models.BooleanField(default=False, help_text=b'This interface is used only for out-of-band management', verbose_name=b'OOB Management'), - ), - ] diff --git a/netbox/dcim/migrations/0009_auto_20160622_1408.py b/netbox/dcim/migrations/0009_auto_20160622_1408.py deleted file mode 100644 index c52d015e2..000000000 --- a/netbox/dcim/migrations/0009_auto_20160622_1408.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-22 14:08 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0008_auto_20160621_1843'), - ] - - operations = [ - migrations.AddField( - model_name='device', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='device', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 7, 52, 775280)), - preserve_default=False, - ), - migrations.AddField( - model_name='rack', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='rack', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 8, 27, 534709)), - preserve_default=False, - ), - migrations.AddField( - model_name='site', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='site', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 8, 37, 622017)), - preserve_default=False, - ), - ] diff --git a/netbox/extras/migrations/0001_initial.py b/netbox/extras/migrations/0001_initial.py index 3d370b539..949b3a2d8 100644 --- a/netbox/extras/migrations/0001_initial.py +++ b/netbox/extras/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-27 02:35 +# Generated by Django 1.9.7 on 2016-06-22 18:21 from __future__ import unicode_literals +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,6 +13,8 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('dcim', '0002_auto_20160622_1821'), ] operations = [ @@ -43,6 +46,35 @@ class Migration(migrations.Migration): 'ordering': ['type', 'weight', 'name'], }, ), + migrations.CreateModel( + name='TopologyMap', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50, unique=True)), + ('slug', models.SlugField(unique=True)), + ('device_patterns', models.TextField(help_text=b'Identify devices to include in the diagram using regular expressions,one per line. Each line will result in a new tier of the drawing. Separate multiple regexes on a line using commas. Devices will be rendered in the order they are defined.')), + ('description', models.CharField(blank=True, max_length=100)), + ('site', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='topology_maps', to='dcim.Site')), + ], + options={ + 'ordering': ['name'], + }, + ), + migrations.CreateModel( + name='UserAction', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('time', models.DateTimeField(auto_now_add=True)), + ('object_id', models.PositiveIntegerField(blank=True, null=True)), + ('action', models.PositiveSmallIntegerField(choices=[(1, b'created'), (2, b'imported'), (3, b'modified'), (4, b'bulk edited'), (5, b'deleted'), (6, b'bulk deleted')])), + ('message', models.TextField(blank=True)), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='actions', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'ordering': ['-time'], + }, + ), migrations.AlterUniqueTogether( name='exporttemplate', unique_together=set([('content_type', 'name')]), diff --git a/netbox/extras/migrations/0002_topologymap.py b/netbox/extras/migrations/0002_topologymap.py deleted file mode 100644 index 066b51b5a..000000000 --- a/netbox/extras/migrations/0002_topologymap.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-04-08 18:53 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0005_auto_20160328_2135'), - ('extras', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='TopologyMap', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50, unique=True)), - ('slug', models.SlugField(unique=True)), - ('device_patterns', models.TextField()), - ('description', models.CharField(blank=True, max_length=100)), - ('site', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='topology_maps', to='dcim.Site')), - ], - options={ - 'ordering': ['name'], - }, - ), - ] diff --git a/netbox/extras/migrations/0003_auto_20160412_1332.py b/netbox/extras/migrations/0003_auto_20160412_1332.py deleted file mode 100644 index 4664bdf81..000000000 --- a/netbox/extras/migrations/0003_auto_20160412_1332.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-04-12 13:32 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('extras', '0002_topologymap'), - ] - - operations = [ - migrations.AlterField( - model_name='topologymap', - name='device_patterns', - field=models.TextField(help_text=b'Identify devices to include in the diagram using regular expressions,one per line. Each line will result in a new tier of the drawing. Separate multiple regexes on a line using commas. Devices will be rendered in the order they are defined.'), - ), - ] diff --git a/netbox/extras/migrations/0004_useraction.py b/netbox/extras/migrations/0004_useraction.py deleted file mode 100644 index f42caa34f..000000000 --- a/netbox/extras/migrations/0004_useraction.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-23 18:16 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('contenttypes', '0002_remove_content_type_name'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('extras', '0003_auto_20160412_1332'), - ] - - operations = [ - migrations.CreateModel( - name='UserAction', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('time', models.DateTimeField(auto_now_add=True)), - ('object_id', models.PositiveIntegerField(blank=True, null=True)), - ('action', models.PositiveSmallIntegerField(choices=[(1, b'created'), (2, b'imported'), (3, b'modified'), (4, b'bulk edited'), (5, b'deleted'), (6, b'bulk deleted')])), - ('message', models.TextField(blank=True)), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'ordering': ['-time'], - }, - ), - ] diff --git a/netbox/extras/migrations/0005_auto_20160524_1324.py b/netbox/extras/migrations/0005_auto_20160524_1324.py deleted file mode 100644 index d1c214a75..000000000 --- a/netbox/extras/migrations/0005_auto_20160524_1324.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-24 13:24 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('extras', '0004_useraction'), - ] - - operations = [ - migrations.AlterField( - model_name='useraction', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='actions', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/netbox/ipam/migrations/0001_initial.py b/netbox/ipam/migrations/0001_initial.py index d75b76f2d..f98d04952 100644 --- a/netbox/ipam/migrations/0001_initial.py +++ b/netbox/ipam/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-27 02:35 +# Generated by Django 1.9.7 on 2016-06-22 18:21 from __future__ import unicode_literals import django.core.validators @@ -21,6 +21,8 @@ class Migration(migrations.Migration): name='Aggregate', 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)), ('family', models.PositiveSmallIntegerField(choices=[(4, b'IPv4'), (6, b'IPv6')])), ('prefix', ipam.fields.IPNetworkField()), ('date_added', models.DateField(blank=True, null=True)), @@ -34,6 +36,8 @@ class Migration(migrations.Migration): name='IPAddress', 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)), ('family', models.PositiveSmallIntegerField(choices=[(4, b'IPv4'), (6, b'IPv6')], editable=False)), ('address', ipam.fields.IPAddressField()), ('description', models.CharField(blank=True, max_length=100)), @@ -50,8 +54,11 @@ class Migration(migrations.Migration): name='Prefix', 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)), ('family', models.PositiveSmallIntegerField(choices=[(4, b'IPv4'), (6, b'IPv6')], editable=False)), ('prefix', ipam.fields.IPNetworkField()), + ('status', models.PositiveSmallIntegerField(choices=[(0, b'Container'), (1, b'Active'), (2, b'Reserved'), (3, b'Deprecated')], default=1, verbose_name=b'Status')), ('description', models.CharField(blank=True, max_length=100)), ], options={ @@ -84,29 +91,17 @@ class Migration(migrations.Migration): 'ordering': ['weight', 'name'], }, ), - migrations.CreateModel( - name='Status', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50, unique=True)), - ('slug', models.SlugField(unique=True)), - ('weight', models.PositiveSmallIntegerField(default=1000)), - ('bootstrap_class', models.PositiveSmallIntegerField(choices=[(0, b'Default'), (1, b'Primary'), (2, b'Success'), (3, b'Info'), (4, b'Warning'), (5, b'Danger')], default=0)), - ], - options={ - 'ordering': ['weight', 'name'], - 'verbose_name_plural': 'statuses', - }, - ), migrations.CreateModel( name='VLAN', 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)), ('vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)], verbose_name=b'ID')), ('name', models.CharField(max_length=30)), + ('status', models.PositiveSmallIntegerField(choices=[(1, b'Active'), (2, b'Reserved'), (3, b'Deprecated')], default=1, verbose_name=b'Status')), ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='vlans', to='ipam.Role')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='vlans', to='dcim.Site')), - ('status', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='vlans', to='ipam.Status')), ], options={ 'ordering': ['site', 'vid'], @@ -118,6 +113,8 @@ class Migration(migrations.Migration): name='VRF', 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=50)), ('rd', models.CharField(max_length=21, unique=True, verbose_name=b'Route distinguisher')), ('description', models.CharField(blank=True, max_length=100)), @@ -138,11 +135,6 @@ class Migration(migrations.Migration): name='site', field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='prefixes', to='dcim.Site'), ), - migrations.AddField( - model_name='prefix', - name='status', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='prefixes', to='ipam.Status'), - ), migrations.AddField( model_name='prefix', name='vlan', diff --git a/netbox/ipam/migrations/0002_auto_20160517_2007.py b/netbox/ipam/migrations/0002_auto_20160517_2007.py deleted file mode 100644 index 597bb5130..000000000 --- a/netbox/ipam/migrations/0002_auto_20160517_2007.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-17 20:07 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ipam', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='prefix', - name='status_new', - field=models.PositiveSmallIntegerField(choices=[(0, b'Container'), (1, b'Active'), (2, b'Reserved'), (3, b'Deprecated')], default=1, verbose_name=b'Status'), - ), - migrations.AddField( - model_name='vlan', - name='status_new', - field=models.PositiveSmallIntegerField(choices=[(1, b'Active'), (2, b'Reserved'), (3, b'Deprecated')], default=1, verbose_name=b'Status'), - ), - ] diff --git a/netbox/ipam/migrations/0003_auto_20160517_2026.py b/netbox/ipam/migrations/0003_auto_20160517_2026.py deleted file mode 100644 index 4bd50c28a..000000000 --- a/netbox/ipam/migrations/0003_auto_20160517_2026.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-17 20:26 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ipam', '0002_auto_20160517_2007'), - ] - - operations = [ - migrations.AlterField( - model_name='prefix', - name='status', - field=models.PositiveSmallIntegerField(choices=[(0, b'Container'), (1, b'Active'), (2, b'Reserved'), (3, b'Deprecated')], default=1, verbose_name=b'Status'), - ), - migrations.AlterField( - model_name='vlan', - name='status', - field=models.PositiveSmallIntegerField(choices=[(1, b'Active'), (2, b'Reserved'), (3, b'Deprecated')], default=1, verbose_name=b'Status'), - ), - ] diff --git a/netbox/ipam/migrations/0004_auto_20160517_2044.py b/netbox/ipam/migrations/0004_auto_20160517_2044.py deleted file mode 100644 index 9c88f528d..000000000 --- a/netbox/ipam/migrations/0004_auto_20160517_2044.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-17 20:44 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ipam', '0003_auto_20160517_2026'), - ] - - operations = [ - migrations.RemoveField( - model_name='prefix', - name='status_new', - ), - migrations.RemoveField( - model_name='vlan', - name='status_new', - ), - ] diff --git a/netbox/ipam/migrations/0005_delete_status.py b/netbox/ipam/migrations/0005_delete_status.py deleted file mode 100644 index d00600cce..000000000 --- a/netbox/ipam/migrations/0005_delete_status.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-17 20:54 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ipam', '0004_auto_20160517_2044'), - ] - - operations = [ - migrations.DeleteModel( - name='Status', - ), - ] diff --git a/netbox/ipam/migrations/0006_auto_20160622_1413.py b/netbox/ipam/migrations/0006_auto_20160622_1413.py deleted file mode 100644 index 20c12aec7..000000000 --- a/netbox/ipam/migrations/0006_auto_20160622_1413.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-22 14:13 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ipam', '0005_delete_status'), - ] - - operations = [ - migrations.AddField( - model_name='aggregate', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='aggregate', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 12, 29, 891569)), - preserve_default=False, - ), - migrations.AddField( - model_name='ipaddress', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='ipaddress', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 12, 39, 666885)), - preserve_default=False, - ), - migrations.AddField( - model_name='prefix', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='prefix', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 12, 48, 11411)), - preserve_default=False, - ), - migrations.AddField( - model_name='vlan', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='vlan', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 12, 56, 963230)), - preserve_default=False, - ), - migrations.AddField( - model_name='vrf', - name='created', - field=models.DateField(auto_now_add=True, default=datetime.date(2016, 6, 22)), - preserve_default=False, - ), - migrations.AddField( - model_name='vrf', - name='last_updated', - field=models.DateTimeField(auto_now=True, default=datetime.datetime(2016, 6, 22, 14, 13, 4, 387113)), - preserve_default=False, - ), - ] diff --git a/netbox/secrets/migrations/0001_initial.py b/netbox/secrets/migrations/0001_initial.py index c2962a611..8dc0d54c6 100644 --- a/netbox/secrets/migrations/0001_initial.py +++ b/netbox/secrets/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-27 02:35 +# Generated by Django 1.9.7 on 2016-06-22 18:21 from __future__ import unicode_literals from django.conf import settings @@ -12,7 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('contenttypes', '0002_remove_content_type_name'), + ('dcim', '0002_auto_20160622_1821'), + ('auth', '0007_alter_validators_add_error_messages'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -21,17 +22,15 @@ class Migration(migrations.Migration): name='Secret', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('object_id', models.PositiveIntegerField()), + ('created', models.DateField(auto_now_add=True)), + ('last_updated', models.DateTimeField(auto_now=True)), ('name', models.CharField(blank=True, max_length=100)), ('ciphertext', models.BinaryField(max_length=65568)), ('hash', models.CharField(editable=False, max_length=128)), - ('created', models.DateTimeField(auto_now_add=True, verbose_name=b'Created')), - ('last_modified', models.DateTimeField(auto_now=True, verbose_name=b'Last modified')), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='secrets', to='dcim.Device')), ], options={ - 'ordering': ['role', 'name'], - 'permissions': (('view_secret', 'Can view secrets'),), + 'ordering': ['device', 'role', 'name'], }, ), migrations.CreateModel( @@ -40,6 +39,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=50, unique=True)), ('slug', models.SlugField(unique=True)), + ('groups', models.ManyToManyField(blank=True, related_name='secretroles', to='auth.Group')), + ('users', models.ManyToManyField(blank=True, related_name='secretroles', to=settings.AUTH_USER_MODEL)), ], options={ 'ordering': ['name'], @@ -49,10 +50,10 @@ class Migration(migrations.Migration): name='UserKey', 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)), ('public_key', models.TextField(verbose_name=b'RSA public key')), ('master_key_cipher', models.BinaryField(blank=True, max_length=512, null=True)), - ('created', models.DateTimeField(auto_now_add=True, verbose_name=b'Time created')), - ('last_modified', models.DateTimeField(auto_now=True, verbose_name=b'Last modified')), ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='user_key', to=settings.AUTH_USER_MODEL, verbose_name=b'User')), ], options={ @@ -65,4 +66,8 @@ class Migration(migrations.Migration): name='role', field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='secrets', to='secrets.SecretRole'), ), + migrations.AlterUniqueTogether( + name='secret', + unique_together=set([('device', 'role', 'name')]), + ), ] diff --git a/netbox/secrets/migrations/0002_auto_20160321_1448.py b/netbox/secrets/migrations/0002_auto_20160321_1448.py deleted file mode 100644 index 6087cdcc3..000000000 --- a/netbox/secrets/migrations/0002_auto_20160321_1448.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-03-21 14:48 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0003_auto_20160304_1642'), - ('secrets', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='secret', - name='content_type', - ), - migrations.RemoveField( - model_name='secret', - name='object_id', - ), - migrations.AddField( - model_name='secret', - name='device', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='secrets', to='dcim.Device'), - preserve_default=False, - ), - ] diff --git a/netbox/secrets/migrations/0003_auto_20160321_1524.py b/netbox/secrets/migrations/0003_auto_20160321_1524.py deleted file mode 100644 index db74af79b..000000000 --- a/netbox/secrets/migrations/0003_auto_20160321_1524.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-03-21 15:24 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('secrets', '0002_auto_20160321_1448'), - ] - - operations = [ - migrations.AlterModelOptions( - name='secret', - options={'ordering': ['device', 'role', 'name'], 'permissions': (('view_secret', 'Can view secrets'),)}, - ), - ] diff --git a/netbox/secrets/migrations/0004_auto_20160407_1548.py b/netbox/secrets/migrations/0004_auto_20160407_1548.py deleted file mode 100644 index d2f7e1c5d..000000000 --- a/netbox/secrets/migrations/0004_auto_20160407_1548.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-04-07 15:48 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auth', '0007_alter_validators_add_error_messages'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('secrets', '0003_auto_20160321_1524'), - ] - - operations = [ - migrations.AlterModelOptions( - name='secret', - options={'ordering': ['device', 'role', 'name']}, - ), - migrations.AddField( - model_name='secretrole', - name='groups', - field=models.ManyToManyField(blank=True, related_name='secretroles', to='auth.Group'), - ), - migrations.AddField( - model_name='secretrole', - name='users', - field=models.ManyToManyField(blank=True, related_name='secretroles', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/netbox/secrets/migrations/0005_auto_20160614_2019.py b/netbox/secrets/migrations/0005_auto_20160614_2019.py deleted file mode 100644 index bd4aa3c98..000000000 --- a/netbox/secrets/migrations/0005_auto_20160614_2019.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-14 20:19 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('secrets', '0004_auto_20160407_1548'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='secret', - unique_together=set([('device', 'role', 'name')]), - ), - ] diff --git a/netbox/secrets/migrations/0006_auto_20160622_1501.py b/netbox/secrets/migrations/0006_auto_20160622_1501.py deleted file mode 100644 index 861fcbc03..000000000 --- a/netbox/secrets/migrations/0006_auto_20160622_1501.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-22 15:01 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('secrets', '0005_auto_20160614_2019'), - ] - - operations = [ - migrations.RenameField( - model_name='secret', - old_name='last_modified', - new_name='last_updated', - ), - migrations.RenameField( - model_name='userkey', - old_name='last_modified', - new_name='last_updated', - ), - ] diff --git a/netbox/secrets/migrations/0007_auto_20160622_1507.py b/netbox/secrets/migrations/0007_auto_20160622_1507.py deleted file mode 100644 index fe5e2ea2c..000000000 --- a/netbox/secrets/migrations/0007_auto_20160622_1507.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-22 15:07 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('secrets', '0006_auto_20160622_1501'), - ] - - operations = [ - migrations.AlterField( - model_name='secret', - name='created', - field=models.DateField(auto_now_add=True), - ), - migrations.AlterField( - model_name='secret', - name='last_updated', - field=models.DateTimeField(auto_now=True), - ), - migrations.AlterField( - model_name='userkey', - name='created', - field=models.DateField(auto_now_add=True), - ), - migrations.AlterField( - model_name='userkey', - name='last_updated', - field=models.DateTimeField(auto_now=True), - ), - ] diff --git a/netbox/users/migrations/0001_initial.py b/netbox/users/migrations/0001_initial.py deleted file mode 100644 index 53aa32cae..000000000 --- a/netbox/users/migrations/0001_initial.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-29 18:49 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ] - - operations = [ - ] diff --git a/netbox/users/migrations/__init__.py b/netbox/users/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/netbox/utilities/migrations/0001_initial.py b/netbox/utilities/migrations/0001_initial.py deleted file mode 100644 index 2e65b3ffa..000000000 --- a/netbox/utilities/migrations/0001_initial.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-29 18:50 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ] - - operations = [ - ] diff --git a/netbox/utilities/migrations/__init__.py b/netbox/utilities/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000