|
@@ -200,7 +200,7 @@ class Aggregate(CreatedUpdatedModel, CustomFieldModel):
|
|
|
|
|
|
def get_utilization(self):
|
|
|
"""
|
|
|
- Determine the utilization rate of the aggregate prefix and return it as a percentage.
|
|
|
+ Determine the prefix utilization of the aggregate and return it as a percentage.
|
|
|
"""
|
|
|
child_prefixes = Prefix.objects.filter(prefix__net_contained_or_equal=str(self.prefix))
|
|
|
# Remove overlapping prefixes from list of children
|
|
@@ -307,9 +307,6 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel):
|
|
|
def get_absolute_url(self):
|
|
|
return reverse('ipam:prefix', args=[self.pk])
|
|
|
|
|
|
- def get_duplicates(self):
|
|
|
- return Prefix.objects.filter(vrf=self.vrf, prefix=str(self.prefix)).exclude(pk=self.pk)
|
|
|
-
|
|
|
def clean(self):
|
|
|
|
|
|
if self.prefix:
|
|
@@ -357,6 +354,22 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel):
|
|
|
self.description,
|
|
|
])
|
|
|
|
|
|
+ def get_status_class(self):
|
|
|
+ return STATUS_CHOICE_CLASSES[self.status]
|
|
|
+
|
|
|
+ def get_duplicates(self):
|
|
|
+ return Prefix.objects.filter(vrf=self.vrf, prefix=str(self.prefix)).exclude(pk=self.pk)
|
|
|
+
|
|
|
+ def get_utilization(self):
|
|
|
+ """
|
|
|
+ Determine the utilization of the prefix and return it as a percentage.
|
|
|
+ """
|
|
|
+ child_count = IPAddress.objects.filter(address__net_contained_or_equal=str(self.prefix), vrf=self.vrf).count()
|
|
|
+ prefix_size = self.prefix.size
|
|
|
+ if self.family == 4 and self.prefix.prefixlen < 31 and not self.is_pool:
|
|
|
+ prefix_size -= 2
|
|
|
+ return int(float(child_count) / prefix_size * 100)
|
|
|
+
|
|
|
@property
|
|
|
def new_subnet(self):
|
|
|
if self.family == 4:
|
|
@@ -368,9 +381,6 @@ class Prefix(CreatedUpdatedModel, CustomFieldModel):
|
|
|
return IPNetwork('{}/{}'.format(self.prefix.network, self.prefix.prefixlen + 1))
|
|
|
return None
|
|
|
|
|
|
- def get_status_class(self):
|
|
|
- return STATUS_CHOICE_CLASSES[self.status]
|
|
|
-
|
|
|
|
|
|
class IPAddressManager(models.Manager):
|
|
|
|