NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 03:56:53 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

#8232: Cleanup & test fix

Browse Source
This commit is contained in:
jeremystretch 2022-03-25 09:59:58 -04:00
parent 1278429518
commit dde4495e20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/ipam/tests/test_models.py
View File

@ -204,11 +204,11 @@ class TestPrefix(TestCase):
IPAddress.objects.bulk_create([ IPAddress.objects.bulk_create([
IPAddress(address=IPNetwork(f'10.0.0.{i}/24')) for i in range(1, 33) IPAddress(address=IPNetwork(f'10.0.0.{i}/24')) for i in range(1, 33)
]) ])
self.assertEqual(prefix.get_utilization(), 12) # 12.5% utilization self.assertEqual(prefix.get_utilization(), 32 / 254 * 100) # ~12.5% utilization
# Create a child range with 32 additional IPs # Create a child range with 32 additional IPs
IPRange.objects.create(start_address=IPNetwork('10.0.0.33/24'), end_address=IPNetwork('10.0.0.64/24')) IPRange.objects.create(start_address=IPNetwork('10.0.0.33/24'), end_address=IPNetwork('10.0.0.64/24'))
self.assertEqual(prefix.get_utilization(), 25) # 25% utilization self.assertEqual(prefix.get_utilization(), 64 / 254 * 100) # ~25% utilization
# #
# Uniqueness enforcement tests # Uniqueness enforcement tests

4
netbox/utilities/templates/helpers/utilization_graph.html
View File

@ -12,10 +12,10 @@
class="progress-bar {{ bar_class }}" class="progress-bar {{ bar_class }}"
style="width: {{ utilization }}%;" style="width: {{ utilization }}%;"
> >
{% if utilization >= 25 %}{{ utilization|floatformat:-2 }}%{% endif %} {% if utilization >= 25 %}{{ utilization|floatformat:0 }}%{% endif %}
</div> </div>
{% if utilization < 25 %} {% if utilization < 25 %}
<span class="ps-1">{{ utilization|floatformat:-2 }}%</span> <span class="ps-1">{{ utilization|floatformat:0 }}%</span>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}