mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Rename max_utilization to power_factor

Browse Source
This commit is contained in:
Jeremy Stretch
2019-04-10 16:36:38 -04:00
parent ac3e899f5e
commit b22fd2bc44
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/api/serializers.py
View File

@ -660,5 +660,5 @@ class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer):
model = PowerFeed model = PowerFeed
fields = [ fields = [
'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', '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',
] ]

4
netbox/dcim/forms.py
View File

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

2
netbox/dcim/migrations/0072_powerfeeds.py
View File

@ -25,7 +25,7 @@ class Migration(migrations.Migration):
('phase', models.PositiveSmallIntegerField(default=1)), ('phase', models.PositiveSmallIntegerField(default=1)),
('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])),
('amperage', models.PositiveSmallIntegerField(default=20, 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)), ('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')), ('cable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable')),
], ],

8
netbox/dcim/models.py
View File

@ -2907,7 +2907,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
validators=[MinValueValidator(1)], validators=[MinValueValidator(1)],
default=20 default=20
) )
max_utilization = models.PositiveSmallIntegerField( power_factor = models.PositiveSmallIntegerField(
validators=[MinValueValidator(1), MaxValueValidator(100)], validators=[MinValueValidator(1), MaxValueValidator(100)],
default=80, default=80,
help_text="Maximum permissible draw (percentage)" help_text="Maximum permissible draw (percentage)"
@ -2925,7 +2925,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
csv_headers = [ csv_headers = [
'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage',
'amperage', 'max_utilization', 'comments', 'amperage', 'power_factor', 'comments',
] ]
class Meta: class Meta:
@ -2949,7 +2949,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
self.get_phase_display(), self.get_phase_display(),
self.voltage, self.voltage,
self.amperage, self.amperage,
self.max_utilization, self.power_factor,
self.comments, self.comments,
) )
@ -2961,7 +2961,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
@property @property
def available_power(self): 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: if self.phase == POWERFEED_PHASE_3PHASE:
return kva * 1.732 return kva * 1.732
return kva return kva

2
netbox/templates/dcim/powerfeed.html
View File

@ -119,7 +119,7 @@
</tr> </tr>
<tr> <tr>
<td>Max Utilization</td> <td>Max Utilization</td>
<td>{{ powerfeed.max_utilization }}%</td> <td>{{ powerfeed.power_factor }}%</td>
</tr> </tr>
</table> </table>
</div> </div>

2
netbox/templates/dcim/powerfeed_edit.html
View File

@ -20,7 +20,7 @@
{% render_field form.voltage %} {% render_field form.voltage %}
{% render_field form.amperage %} {% render_field form.amperage %}
{% render_field form.phase %} {% render_field form.phase %}
{% render_field form.max_utilization %} {% render_field form.power_factor %}
</div> </div>
</div> </div>
{% if form.custom_fields %} {% if form.custom_fields %}