NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fixed 3-phase choice

Browse Source
This commit is contained in:
Saria Hajjar 2020-01-16 15:49:51 +00:00
parent 573d7d2123
commit 2b17c57535
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/models/device_components.py
View File

@ -427,7 +427,7 @@ class PowerPort(CableTermination, ComponentModel):
cursor.execute(QUERY_POWER_DRAW, [self.pk]) cursor.execute(QUERY_POWER_DRAW, [self.pk])
# Maximum number of power feeds + the global one # Maximum number of power feeds + the global one
results = cursor.fetchmany(len(POWERFEED_LEG_CHOICES) + 1) results = cursor.fetchmany(len(PowerOutletFeedLegChoices.CHOICES) + 1)
# Global results # Global results
allocated_draw_total, maximum_draw_total = get_power_feed_stats(None, results) allocated_draw_total, maximum_draw_total = get_power_feed_stats(None, results)
@ -439,8 +439,8 @@ class PowerPort(CableTermination, ComponentModel):
} }
# Calculate per-leg aggregates for three-phase feeds # Calculate per-leg aggregates for three-phase feeds
if self._connected_powerfeed and self._connected_powerfeed.phase == POWERFEED_PHASE_3PHASE: if self._connected_powerfeed and self._connected_powerfeed.phase == PowerFeedPhaseChoices.PHASE_3PHASE:
for leg, leg_name in POWERFEED_LEG_CHOICES: for leg, leg_name in PowerOutletFeedLegChoices.CHOICES:
allocated_draw_total, maximum_draw_total = get_power_feed_stats(leg, results) allocated_draw_total, maximum_draw_total = get_power_feed_stats(leg, results)
ret['legs'].append({ ret['legs'].append({
'name': leg_name, 'name': leg_name,

6
netbox/dcim/tests/test_models.py
View File

@ -572,7 +572,7 @@ class PowerCalculationTestCase(TestCase):
self.power_feed = PowerFeed.objects.create( self.power_feed = PowerFeed.objects.create(
name='Power Feed 1', name='Power Feed 1',
power_panel=power_panel, power_panel=power_panel,
phase=POWERFEED_PHASE_3PHASE phase=PowerFeedPhaseChoices.PHASE_3PHASE
) )
self.power_port1 = PowerPort.objects.create(device=self.device1, name='Power Port 1') self.power_port1 = PowerPort.objects.create(device=self.device1, name='Power Port 1')
Cable.objects.create(termination_a=self.power_port1, termination_b=self.power_feed) Cable.objects.create(termination_a=self.power_port1, termination_b=self.power_feed)
@ -582,7 +582,7 @@ class PowerCalculationTestCase(TestCase):
device=self.device1, device=self.device1,
name='Power Outlet 12', name='Power Outlet 12',
power_port=self.power_port1, power_port=self.power_port1,
feed_leg=POWERFEED_LEG_A, feed_leg=PowerOutletFeedLegChoices.FEED_LEG_A,
) )
self.power_port21 = PowerPort.objects.create( self.power_port21 = PowerPort.objects.create(
device=self.device2, device=self.device2,
@ -597,7 +597,7 @@ class PowerCalculationTestCase(TestCase):
device=self.device1, device=self.device1,
name='Power Outlet 13', name='Power Outlet 13',
power_port=self.power_port1, power_port=self.power_port1,
feed_leg=POWERFEED_LEG_B, feed_leg=PowerOutletFeedLegChoices.FEED_LEG_B,
) )
self.power_port31 = PowerPort.objects.create( self.power_port31 = PowerPort.objects.create(
device=self.device3, device=self.device3,