Őry Máté · @orymate · Guba Sándor · 6299201d · Guba Sándor · 6299201d
--- a/circle/firewall/models.py
+++ b/circle/firewall/models.py
+        super(Vlan, self).clean()
+        if self.ipv6_template:
+            if not self.network6:
+                raise ValidationError(
+                    _("You cannot specify an IPv6 template if there is no "
+                      "IPv6 network set."))
+            for i in (self.network4[1], self.network4[-1]):
+                i6 = self.convert_ipv4_to_ipv6(i)
+                if i6 not in self.network6:
+                    raise ValidationError(
+                        _("%(ip6)s (translated from %(ip4)s) is outside of "
+                          "the IPv6 network.") % {"ip4": i, "ip6": i6})
+        if not self.ipv6_template and self.network6:
+            # come up with some sensible default
+            self.ipv6_template = self._magic_ipv6_template()
+        host4_bytes = int(ceil((32 - self.network4.prefixlen) / 8))
--- a/circle/firewall/models.py
+++ b/circle/firewall/models.py
    ipv6_template = models.TextField(
-        validators=[val_ipv6_template],
-        verbose_name=_('ipv6 template'),
-        default="2001:738:2001:4031:%(b)d:%(c)d:%(d)d:0")
+        blank=True,
+        help_text=_('Template for translating IPv4 addresses to IPv6. '
+                    'Automatically generated hosts in dual-stack networks '
+                    'will get this address. The template '
+                    'can contain four tokens: "%(a)d", "%(b)d", '
+                    '"%(c)d", and "%(d)d", representing the four bytes '
+                    'of the IPv4 address, respectively, in decimal notation. '
+                    'Moreover you can use any standard printf format '
+                    'specification like %(a)02x to get the first byte as two '
+                    'hexadecimal digits. Usual choices for mapping '
+                    '198.51.100.0/24 to 2001:0DB8:1:1::/64 would be '
+                    '"2001:0DB8:51:1:1:%(d)d::" and '
--- a/circle/network/forms.py
+++ b/circle/network/forms.py
            Fieldset(
                _('Network'),
                'vlan',
-                'ipv4',
-                'ipv6',
+                AppendedText('ipv4',
--- a/circle/firewall/models.py
+++ b/circle/firewall/models.py
        else:
            raise WorkerNotFound()
  
+    @method_cache(20)
+    def get_dhcp_clients(self):
+        try:
+            return get_dhcp_clients.apply_async(
+                queue=self.get_remote_queue_name(), expires=60).get(timeout=2)
+        except TimeoutError: