Skip to content

CIRCLE / cloud

Go to a project
Commit 0cea7892 by Dudás Ádám
Options

firewall: refactor method implementation

parent ea943848
Showing with 8 additions and 6 deletions
circle/firewall/models.py
...@@ -308,14 +308,16 @@ class Vlan(AclBase, models.Model): ...@@ -308,14 +308,16 @@ class Vlan(AclBase, models.Model):
ipv4 = str(ipv4) ipv4 = str(ipv4)
if ipv4 not in used_v4: if ipv4 not in used_v4:
logger.debug("Found unused IPv4 address %s.", ipv4) logger.debug("Found unused IPv4 address %s.", ipv4)
if self.network6 is None: ipv6 = None
return {'ipv4': ipv4, 'ipv6': None} if self.network6 is not None:
else:
ipv6 = ipv4_2_ipv6(self.ipv6_template, ipv4) ipv6 = ipv4_2_ipv6(self.ipv6_template, ipv4)
if ipv6 not in used_v6: if ipv6 in used_v6:
continue
else:
logger.debug("Found unused IPv6 address %s.", ipv6) logger.debug("Found unused IPv6 address %s.", ipv6)
return {'ipv4': ipv4, 'ipv6': ipv6} return {'ipv4': ipv4, 'ipv6': ipv6}
raise ValidationError(_("All IP addresses are already in use.")) else:
raise ValidationError(_("All IP addresses are already in use."))
class VlanGroup(models.Model): class VlanGroup(models.Model):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment