From b22fd2bc44db3b98adf8cce41d1cf0c754c4fdf5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 10 Apr 2019 16:36:38 -0400
Subject: [PATCH] Rename max_utilization to power_factor

---
 netbox/dcim/api/serializers.py            | 2 +-
 netbox/dcim/forms.py                      | 4 ++--
 netbox/dcim/migrations/0072_powerfeeds.py | 2 +-
 netbox/dcim/models.py                     | 8 ++++----
 netbox/templates/dcim/powerfeed.html      | 2 +-
 netbox/templates/dcim/powerfeed_edit.html | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 402fc5e13..8c3364a1b 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -660,5 +660,5 @@ class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer):
         model = PowerFeed
         fields = [
             'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage',
-            'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'power_factor', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
         ]
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index f8aa7708d..8fcad0bfe 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -3464,7 +3464,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm):
         model = PowerFeed
         fields = [
             'site', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage',
-            'max_utilization', 'comments', 'tags',
+            'power_factor', 'comments', 'tags',
         ]
         widgets = {
             'power_panel': APISelect(
@@ -3610,7 +3610,7 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
     amperage = forms.IntegerField(
         required=False
     )
-    max_utilization = forms.IntegerField(
+    power_factor = forms.IntegerField(
         required=False
     )
     comments = forms.CharField(
diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py
index 4eb43c20b..9bd24e041 100644
--- a/netbox/dcim/migrations/0072_powerfeeds.py
+++ b/netbox/dcim/migrations/0072_powerfeeds.py
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
                 ('phase', models.PositiveSmallIntegerField(default=1)),
                 ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])),
                 ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])),
-                ('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])),
+                ('power_factor', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])),
                 ('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/models.py b/netbox/dcim/models.py
index d1f9f59f2..cdaf247c8 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -2907,7 +2907,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
         validators=[MinValueValidator(1)],
         default=20
     )
-    max_utilization = models.PositiveSmallIntegerField(
+    power_factor = models.PositiveSmallIntegerField(
         validators=[MinValueValidator(1), MaxValueValidator(100)],
         default=80,
         help_text="Maximum permissible draw (percentage)"
@@ -2925,7 +2925,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
 
     csv_headers = [
         'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage',
-        'amperage', 'max_utilization', 'comments',
+        'amperage', 'power_factor', 'comments',
     ]
 
     class Meta:
@@ -2949,7 +2949,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
             self.get_phase_display(),
             self.voltage,
             self.amperage,
-            self.max_utilization,
+            self.power_factor,
             self.comments,
         )
 
@@ -2961,7 +2961,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
 
     @property
     def available_power(self):
-        kva = self.voltage * self.amperage * self.max_utilization
+        kva = self.voltage * self.amperage * self.power_factor
         if self.phase == POWERFEED_PHASE_3PHASE:
             return kva * 1.732
         return kva
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index b48e2f602..0686afd20 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -119,7 +119,7 @@
                 </tr>
                 <tr>
                     <td>Max Utilization</td>
-                    <td>{{ powerfeed.max_utilization }}%</td>
+                    <td>{{ powerfeed.power_factor }}%</td>
                 </tr>
             </table>
         </div>
diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html
index f4b3ada46..bdfbfd77d 100644
--- a/netbox/templates/dcim/powerfeed_edit.html
+++ b/netbox/templates/dcim/powerfeed_edit.html
@@ -20,7 +20,7 @@
             {% render_field form.voltage %}
             {% render_field form.amperage %}
             {% render_field form.phase %}
-            {% render_field form.max_utilization %}
+            {% render_field form.power_factor %}
         </div>
     </div>
     {% if form.custom_fields %}