Przeglądaj źródła

Fixes #3126: Incorrect calculation of PowerFeed available power

Jeremy Stretch 6 lat temu
rodzic
commit
cb93303f56
2 zmienionych plików z 5 dodań i 4 usunięć
  1. 1 0
      CHANGELOG.md
  2. 4 4
      netbox/dcim/models.py

+ 1 - 0
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
 
 
 ---

+ 4 - 4
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)