From 65b008a493df0c9501422b15106cee35aff7ab60 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Jul 2016 18:01:01 -0400 Subject: [PATCH] Cleaned up migrations --- .../migrations/0004_circuit_add_tenant.py | 2 +- .../0012_site_rack_device_add_tenant.py | 8 ++--- .../migrations/0013_tenant_related_names.py | 31 ------------------- netbox/tenancy/migrations/0001_initial.py | 5 +-- .../migrations/0002_add_tenant_description.py | 25 --------------- 5 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 netbox/dcim/migrations/0013_tenant_related_names.py delete mode 100644 netbox/tenancy/migrations/0002_add_tenant_description.py diff --git a/netbox/circuits/migrations/0004_circuit_add_tenant.py b/netbox/circuits/migrations/0004_circuit_add_tenant.py index 87988bb43..641b13afd 100644 --- a/netbox/circuits/migrations/0004_circuit_add_tenant.py +++ b/netbox/circuits/migrations/0004_circuit_add_tenant.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-07-26 19:29 +# Generated by Django 1.9.8 on 2016-07-26 21:59 from __future__ import unicode_literals from django.db import migrations, models diff --git a/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py b/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py index f1092b4fa..8dcf8f81a 100644 --- a/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py +++ b/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-07-26 20:06 +# Generated by Django 1.9.8 on 2016-07-26 21:59 from __future__ import unicode_literals from django.db import migrations, models @@ -17,16 +17,16 @@ class Migration(migrations.Migration): migrations.AddField( model_name='device', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='tenancy.Tenant'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='tenancy.Tenant'), ), migrations.AddField( model_name='rack', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='tenancy.Tenant'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='racks', to='tenancy.Tenant'), ), migrations.AddField( model_name='site', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='tenancy.Tenant'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='sites', to='tenancy.Tenant'), ), ] diff --git a/netbox/dcim/migrations/0013_tenant_related_names.py b/netbox/dcim/migrations/0013_tenant_related_names.py deleted file mode 100644 index f5e3bd725..000000000 --- a/netbox/dcim/migrations/0013_tenant_related_names.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-07-26 21:15 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0012_site_rack_device_add_tenant'), - ] - - operations = [ - migrations.AlterField( - model_name='device', - name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='tenancy.Tenant'), - ), - migrations.AlterField( - model_name='rack', - name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='racks', to='tenancy.Tenant'), - ), - migrations.AlterField( - model_name='site', - name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='sites', to='tenancy.Tenant'), - ), - ] diff --git a/netbox/tenancy/migrations/0001_initial.py b/netbox/tenancy/migrations/0001_initial.py index 990f78874..ed2f800ef 100644 --- a/netbox/tenancy/migrations/0001_initial.py +++ b/netbox/tenancy/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-07-26 18:15 +# Generated by Django 1.9.8 on 2016-07-26 21:58 from __future__ import unicode_literals from django.db import migrations, models @@ -20,8 +20,9 @@ class Migration(migrations.Migration): ('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)), + ('name', models.CharField(max_length=30, unique=True)), ('slug', models.SlugField(unique=True)), + ('description', models.CharField(blank=True, help_text=b'Long-form name (optional)', max_length=100)), ('comments', models.TextField(blank=True)), ], options={ diff --git a/netbox/tenancy/migrations/0002_add_tenant_description.py b/netbox/tenancy/migrations/0002_add_tenant_description.py deleted file mode 100644 index 4dea3ac38..000000000 --- a/netbox/tenancy/migrations/0002_add_tenant_description.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-07-26 21:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('tenancy', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='tenant', - name='description', - field=models.CharField(blank=True, help_text=b'Long-form name (optional)', max_length=100), - ), - migrations.AlterField( - model_name='tenant', - name='name', - field=models.CharField(max_length=30, unique=True), - ), - ]