Browse Source

Squashed migrations in preparation for public release

Jeremy Stretch 10 năm trước cách đây
mục cha
commit
cbd7b5b4c3
36 tập tin đã thay đổi với 129 bổ sung810 xóa
  1. 9 27
      netbox/circuits/migrations/0001_initial.py
  2. 0 25
      netbox/circuits/migrations/0002_auto_20160620_1929.py
  3. 43 0
      netbox/circuits/migrations/0002_auto_20160622_1821.py
  4. 0 25
      netbox/circuits/migrations/0003_auto_20160621_1728.py
  5. 0 40
      netbox/circuits/migrations/0004_auto_20160622_1410.py
  6. 14 7
      netbox/dcim/migrations/0001_initial.py
  7. 2 2
      netbox/dcim/migrations/0002_auto_20160622_1821.py
  8. 0 30
      netbox/dcim/migrations/0003_auto_20160304_1642.py
  9. 0 29
      netbox/dcim/migrations/0004_auto_20160328_2109.py
  10. 0 19
      netbox/dcim/migrations/0005_auto_20160328_2135.py
  11. 0 19
      netbox/dcim/migrations/0006_remove_device_ro_snmp.py
  12. 0 20
      netbox/dcim/migrations/0007_module_discovered.py
  13. 0 20
      netbox/dcim/migrations/0008_auto_20160621_1843.py
  14. 0 52
      netbox/dcim/migrations/0009_auto_20160622_1408.py
  15. 33 1
      netbox/extras/migrations/0001_initial.py
  16. 0 31
      netbox/extras/migrations/0002_topologymap.py
  17. 0 20
      netbox/extras/migrations/0003_auto_20160412_1332.py
  18. 0 34
      netbox/extras/migrations/0004_useraction.py
  19. 0 22
      netbox/extras/migrations/0005_auto_20160524_1324.py
  20. 13 21
      netbox/ipam/migrations/0001_initial.py
  21. 0 25
      netbox/ipam/migrations/0002_auto_20160517_2007.py
  22. 0 25
      netbox/ipam/migrations/0003_auto_20160517_2026.py
  23. 0 23
      netbox/ipam/migrations/0004_auto_20160517_2044.py
  24. 0 18
      netbox/ipam/migrations/0005_delete_status.py
  25. 0 76
      netbox/ipam/migrations/0006_auto_20160622_1413.py
  26. 15 10
      netbox/secrets/migrations/0001_initial.py
  27. 0 31
      netbox/secrets/migrations/0002_auto_20160321_1448.py
  28. 0 19
      netbox/secrets/migrations/0003_auto_20160321_1524.py
  29. 0 32
      netbox/secrets/migrations/0004_auto_20160407_1548.py
  30. 0 19
      netbox/secrets/migrations/0005_auto_20160614_2019.py
  31. 0 25
      netbox/secrets/migrations/0006_auto_20160622_1501.py
  32. 0 35
      netbox/secrets/migrations/0007_auto_20160622_1507.py
  33. 0 14
      netbox/users/migrations/0001_initial.py
  34. 0 0
      netbox/users/migrations/__init__.py
  35. 0 14
      netbox/utilities/migrations/0001_initial.py
  36. 0 0
      netbox/utilities/migrations/__init__.py

+ 9 - 27
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')]),
-        ),
     ]

+ 0 - 25
netbox/circuits/migrations/0002_auto_20160620_1929.py

@@ -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)'),
-        ),
-    ]

+ 43 - 0
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')]),
+        ),
+    ]

+ 0 - 25
netbox/circuits/migrations/0003_auto_20160621_1728.py

@@ -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'),
-        ),
-    ]

+ 0 - 40
netbox/circuits/migrations/0004_auto_20160622_1410.py

@@ -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,
-        ),
-    ]

+ 14 - 7
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)),

+ 2 - 2
netbox/dcim/migrations/0002_auto_20160227_0235.py → 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',

+ 0 - 30
netbox/dcim/migrations/0003_auto_20160304_1642.py

@@ -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'),
-        ),
-    ]

+ 0 - 29
netbox/dcim/migrations/0004_auto_20160328_2109.py

@@ -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')]),
-        ),
-    ]

+ 0 - 19
netbox/dcim/migrations/0005_auto_20160328_2135.py

@@ -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']},
-        ),
-    ]

+ 0 - 19
netbox/dcim/migrations/0006_remove_device_ro_snmp.py

@@ -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',
-        ),
-    ]

+ 0 - 20
netbox/dcim/migrations/0007_module_discovered.py

@@ -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'),
-        ),
-    ]

+ 0 - 20
netbox/dcim/migrations/0008_auto_20160621_1843.py

@@ -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'),
-        ),
-    ]

+ 0 - 52
netbox/dcim/migrations/0009_auto_20160622_1408.py

@@ -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,
-        ),
-    ]

+ 33 - 1
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')]),

+ 0 - 31
netbox/extras/migrations/0002_topologymap.py

@@ -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'],
-            },
-        ),
-    ]

+ 0 - 20
netbox/extras/migrations/0003_auto_20160412_1332.py

@@ -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.'),
-        ),
-    ]

+ 0 - 34
netbox/extras/migrations/0004_useraction.py

@@ -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'],
-            },
-        ),
-    ]

+ 0 - 22
netbox/extras/migrations/0005_auto_20160524_1324.py

@@ -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),
-        ),
-    ]

+ 13 - 21
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',

+ 0 - 25
netbox/ipam/migrations/0002_auto_20160517_2007.py

@@ -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'),
-        ),
-    ]

+ 0 - 25
netbox/ipam/migrations/0003_auto_20160517_2026.py

@@ -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'),
-        ),
-    ]

+ 0 - 23
netbox/ipam/migrations/0004_auto_20160517_2044.py

@@ -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',
-        ),
-    ]

+ 0 - 18
netbox/ipam/migrations/0005_delete_status.py

@@ -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',
-        ),
-    ]

+ 0 - 76
netbox/ipam/migrations/0006_auto_20160622_1413.py

@@ -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,
-        ),
-    ]

+ 15 - 10
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')]),
+        ),
     ]

+ 0 - 31
netbox/secrets/migrations/0002_auto_20160321_1448.py

@@ -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,
-        ),
-    ]

+ 0 - 19
netbox/secrets/migrations/0003_auto_20160321_1524.py

@@ -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'),)},
-        ),
-    ]

+ 0 - 32
netbox/secrets/migrations/0004_auto_20160407_1548.py

@@ -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),
-        ),
-    ]

+ 0 - 19
netbox/secrets/migrations/0005_auto_20160614_2019.py

@@ -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')]),
-        ),
-    ]

+ 0 - 25
netbox/secrets/migrations/0006_auto_20160622_1501.py

@@ -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',
-        ),
-    ]

+ 0 - 35
netbox/secrets/migrations/0007_auto_20160622_1507.py

@@ -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),
-        ),
-    ]

+ 0 - 14
netbox/users/migrations/0001_initial.py

@@ -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 = [
-    ]

+ 0 - 0
netbox/users/migrations/__init__.py


+ 0 - 14
netbox/utilities/migrations/0001_initial.py

@@ -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 = [
-    ]

+ 0 - 0
netbox/utilities/migrations/__init__.py