NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updates templates for tests & 2.10

Browse Source
This commit is contained in:
Josh VanDeraa 2021-02-10 16:49:32 +00:00
parent 1887bdabe9
commit 4074ed9674
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/dcim/models/racks.py
View File

@ -529,7 +529,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
powerfeeds = PowerFeed.objects.filter(rack=self) powerfeeds = PowerFeed.objects.filter(rack=self)
available_power_total = sum(pf.available_power for pf in powerfeeds) available_power_total = sum(pf.available_power for pf in powerfeeds)
if not available_power_total: if not available_power_total:
return 0 return (0, 0)
pf_powerports = PowerPort.objects.filter( pf_powerports = PowerPort.objects.filter(
_cable_peer_type=ContentType.objects.get_for_model(PowerFeed), _cable_peer_type=ContentType.objects.get_for_model(PowerFeed),
@ -541,11 +541,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
_cable_peer_id__in=poweroutlets.values_list('id', flat=True) _cable_peer_id__in=poweroutlets.values_list('id', flat=True)
).aggregate(Sum('allocated_draw'))['allocated_draw__sum'] or 0 ).aggregate(Sum('allocated_draw'))['allocated_draw__sum'] or 0
if power_stats: return (allocated_draw_total, available_power_total)
allocated_draw_total = sum(x['allocated_draw_total'] or 0 for x in power_stats)
available_power_total = sum(x['available_power'] for x in power_stats)
return (allocated_draw_total, available_power_total) or (0, 0)
return (0, 0)
@extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks') @extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')

2
netbox/dcim/tables/template_code.py
View File

@ -84,7 +84,7 @@ RACKGROUP_ELEVATIONS = """
UTILIZATION_GRAPH = """ UTILIZATION_GRAPH = """
{% load helpers %} {% load helpers %}
{% utilization_graph value %} {% utilization_graph value.0 value.1 value %}
""" """
# #

4
netbox/templates/dcim/device.html
View File

@ -225,7 +225,7 @@
<td>{{ utilization.allocated }}VA</td> <td>{{ utilization.allocated }}VA</td>
{% if powerfeed.available_power %} {% if powerfeed.available_power %}
<td>{{ powerfeed.available_power }}VA</td> <td>{{ powerfeed.available_power }}VA</td>
<td>{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}</td> <td>{% utilization_graph utilization.allocated powerfeed.available_power %}</td>
{% else %} {% else %}
<td class="text-muted">&mdash;</td> <td class="text-muted">&mdash;</td>
<td class="text-muted">&mdash;</td> <td class="text-muted">&mdash;</td>
@ -238,7 +238,7 @@
<td>{{ leg.allocated }}</td> <td>{{ leg.allocated }}</td>
<td>{{ powerfeed.available_power|divide:3 }}VA</td> <td>{{ powerfeed.available_power|divide:3 }}VA</td>
{% with phase_available=powerfeed.available_power|divide:3 %} {% with phase_available=powerfeed.available_power|divide:3 %}
<td>{% utilization_graph leg.allocated|percentage:phase_available %}</td> <td>{% utilization_graph leg.allocated phase_available %}</td>
{% endwith %} {% endwith %}
</tr> </tr>
{% endfor %} {% endfor %}

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

@ -113,7 +113,7 @@
<td> <td>
{{ utilization.allocated }}VA / {{ object.available_power }}VA {{ utilization.allocated }}VA / {{ object.available_power }}VA
{% if object.available_power > 0 %} {% if object.available_power > 0 %}
{% utilization_graph utilization.allocated|percentage:object.available_power %} {% utilization_graph utilization.allocated object.available_power %}
{% endif %} {% endif %}
</td> </td>
{% else %} {% else %}

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

@ -242,7 +242,7 @@
</td> </td>
{% with power_port=powerfeed.connected_endpoint %} {% with power_port=powerfeed.connected_endpoint %}
{% if power_port %} {% if power_port %}
<td>{% utilization_graph power_port.get_power_draw.allocated|percentage:powerfeed.available_power %}</td> <td>{% utilization_graph power_port.get_power_draw.allocated powerfeed.available_power %}</td>
{% else %} {% else %}
<td class="text-muted">N/A</td> <td class="text-muted">N/A</td>
{% endif %} {% endif %}

2
netbox/templates/ipam/prefix.html
View File

@ -180,7 +180,7 @@
</tr> </tr>
<tr> <tr>
<td>Utilization</td> <td>Utilization</td>
<td>{% utilization_graph prefix.get_utilization.0 prefix.get_utilization.1 %}</td> <td>{% utilization_graph object.get_utilization.0 object.get_utilization.1 %}</td>
</tr> </tr>
</table> </table>
</div> </div>