diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index 9bd24e041..00adda4cf 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -26,6 +26,7 @@ class Migration(migrations.Migration): ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), ('power_factor', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), + ('available_power', models.PositiveSmallIntegerField(default=0)), ('comments', models.TextField(blank=True)), ('cable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable')), ], diff --git a/netbox/dcim/migrations/0074_powerfeed_available_power_cache.py b/netbox/dcim/migrations/0074_powerfeed_available_power_cache.py deleted file mode 100644 index 526ef89b1..000000000 --- a/netbox/dcim/migrations/0074_powerfeed_available_power_cache.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.1 on 2019-06-16 07:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dcim', '0073_interface_form_factor_to_type'), - ] - - operations = [ - migrations.AddField( - model_name='powerfeed', - name='available_power', - field=models.PositiveSmallIntegerField(default=0), - ), - ]