diff --git a/CHANGELOG.md b/CHANGELOG.md index 042649676..a7560917a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ v2.6.0 (FUTURE) * [#3123](https://github.com/digitalocean/netbox/issues/3123) - Exempt `/metrics` view from authentication * [#3125](https://github.com/digitalocean/netbox/issues/3125) - Fix exception when viewing PDUs +* [#3126](https://github.com/digitalocean/netbox/issues/3126) - Incorrect calculation of PowerFeed available power --- diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index d6aa43853..61f2159be 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1973,7 +1973,7 @@ class PowerPort(CableTermination, ComponentModel): ) utilization['name'] = 'Leg {}'.format(leg_name) utilization['outlets'] = len(outlet_ids) - utilization['available_power'] = powerfeed_available / 3 + utilization['available_power'] = round(powerfeed_available / 3) stats.append(utilization) return stats @@ -2998,7 +2998,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): @property def available_power(self): - kva = self.voltage * self.amperage * self.power_factor + kva = self.voltage * self.amperage * (self.power_factor / 100) if self.phase == POWERFEED_PHASE_3PHASE: - return kva * 1.732 - return kva + return round(kva * 1.732) + return round(kva)