Rename power_factor to max_utilization

netbox/dcim/api/serializers.py

@@ -685,5 +685,5 @@ class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer):
         model = PowerFeed
         fields = [
             'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage',
-            'power_factor', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
         ]

netbox/dcim/filters.py

@@ -1113,7 +1113,7 @@ class PowerFeedFilter(CustomFieldFilterSet):
 
     class Meta:
         model = PowerFeed
-        fields = ['name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'power_factor']
+        fields = ['name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization']
 
     def search(self, queryset, name, value):
         if not value.strip():

netbox/dcim/forms.py

@@ -3485,7 +3485,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm):
         model = PowerFeed
         fields = [
             'site', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage',
-            'power_factor', 'comments', 'tags',
+            'max_utilization', 'comments', 'tags',
         ]
         widgets = {
             'power_panel': APISelect(
@@ -3639,7 +3639,7 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
     amperage = forms.IntegerField(
         required=False
     )
-    power_factor = forms.IntegerField(
+    max_utilization = forms.IntegerField(
         required=False
     )
     comments = forms.CharField(
@@ -3714,6 +3714,6 @@ class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm):
     amperage = forms.IntegerField(
         required=False
     )
-    power_factor = forms.IntegerField(
+    max_utilization = forms.IntegerField(
         required=False
     )

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)])),
-                ('power_factor', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])),
+                ('max_utilization', 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')),

netbox/dcim/models.py

@@ -2966,7 +2966,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
     available_power = models.PositiveSmallIntegerField(
         default=0
     )
-    power_factor = models.PositiveSmallIntegerField(
+    max_utilization = models.PositiveSmallIntegerField(
         validators=[MinValueValidator(1), MaxValueValidator(100)],
         default=80,
         help_text="Maximum permissible draw (percentage)"
@@ -2984,7 +2984,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
 
     csv_headers = [
         'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage',
-        'amperage', 'power_factor', 'comments',
+        'amperage', 'max_utilization', 'comments',
     ]
 
     class Meta:
@@ -3008,7 +3008,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
             self.get_phase_display(),
             self.voltage,
             self.amperage,
-            self.power_factor,
+            self.max_utilization,
             self.comments,
         )
 
@@ -3023,7 +3023,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
     def save(self, *args, **kwargs):
 
         # Cache the available_power property on the instance
-        kva = self.voltage * self.amperage * (self.power_factor / 100)
+        kva = self.voltage * self.amperage * (self.max_utilization / 100)
         if self.phase == POWERFEED_PHASE_3PHASE:
             self.available_power = round(kva * 1.732)
         self.available_power = round(kva)

netbox/templates/dcim/powerfeed.html

@@ -132,8 +132,8 @@
                     <td>{{ powerfeed.get_phase_display }}</td>
                 </tr>
                 <tr>
-                    <td>Power Factor</td>
+                    <td>Max Utilization</td>
-                    <td>{{ powerfeed.power_factor }}%</td>
+                    <td>{{ powerfeed.max_utilization }}%</td>
                 </tr>
             </table>
         </div>

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.power_factor %}
+            {% render_field form.max_utilization %}
         </div>
     </div>
     {% if form.custom_fields %}