From af38e90f41ab274369bafe6577660cd674b89115 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 2 Nov 2022 11:32:44 +0300
Subject: [PATCH] fix dhcp type interface error

---
 interfaces/forms.py                          | 32 ++++++++++++++++----
 interfaces/templates/create_iface_block.html |  8 ++---
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/interfaces/forms.py b/interfaces/forms.py
index c19ffda..90c4ee0 100644
--- a/interfaces/forms.py
+++ b/interfaces/forms.py
@@ -7,13 +7,33 @@ from django.utils.translation import gettext_lazy as _
 class AddInterface(forms.Form):
     name = forms.CharField(max_length=10, required=True)
     itype = forms.ChoiceField(required=True, choices=(('bridge', 'bridge'), ('ethernet', 'ethernet')))
-    start_mode = forms.ChoiceField(required=True,
-                                   choices=(('none', 'none'), ('onboot', 'onboot'), ('hotplug', 'hotplug')))
+    start_mode = forms.ChoiceField(
+        required=True,
+        choices=(
+            ('none', 'none'),
+            ('onboot', 'onboot'),
+            ('hotplug', 'hotplug')
+        )
+    )
     netdev = forms.CharField(max_length=15, required=True)
-    ipv4_type = forms.ChoiceField(required=True, choices=(('dhcp', 'dhcp'), ('static', 'static'), ('none', 'none')))
+    ipv4_type = forms.ChoiceField(
+        required=True,
+        choices=(
+            ('dhcp', 'dhcp'),
+            ('static', 'static'),
+            ('none', 'none')
+        )
+    )
     ipv4_addr = forms.CharField(max_length=18, required=False)
     ipv4_gw = forms.CharField(max_length=15, required=False)
-    ipv6_type = forms.ChoiceField(required=True, choices=(('dhcp', 'dhcp'), ('static', 'static'), ('none', 'none')))
+    ipv6_type = forms.ChoiceField(
+        required=True,
+        choices=(
+            ('dhcp', 'dhcp'),
+            ('static', 'static'),
+            ('none', 'none')
+        )
+    )
     ipv6_addr = forms.CharField(max_length=100, required=False)
     ipv6_gw = forms.CharField(max_length=100, required=False)
     stp = forms.ChoiceField(required=False, choices=(('on', 'on'), ('off', 'off')))
@@ -39,7 +59,7 @@ class AddInterface(forms.Form):
 
     def clean_ipv6_addr(self):
         ipv6_addr = self.cleaned_data['ipv6_addr']
-        have_symbol = re.match('^[0-9a-f./:]+$', ipv6_addr)
+        have_symbol = re.match('^[0-9a-f./:]+|^$', ipv6_addr)
         if not have_symbol:
             raise forms.ValidationError(_('The IPv6 address must not contain any special characters'))
         elif len(ipv6_addr) > 100:
@@ -48,7 +68,7 @@ class AddInterface(forms.Form):
 
     def clean_ipv6_gw(self):
         ipv6_gw = self.cleaned_data['ipv6_gw']
-        have_symbol = re.match('^[0-9.]+$', ipv6_gw)
+        have_symbol = re.match('^[0-9a-f./:]+|^$', ipv6_gw)
         if not have_symbol:
             raise forms.ValidationError(_('The IPv6 gateway must not contain any special characters'))
         elif len(ipv6_gw) > 100:
diff --git a/interfaces/templates/create_iface_block.html b/interfaces/templates/create_iface_block.html
index f5bb627..8583297 100644
--- a/interfaces/templates/create_iface_block.html
+++ b/interfaces/templates/create_iface_block.html
@@ -95,13 +95,13 @@
                                     <div class="row static_ipv4_form_group">
                                         <label class="col-sm-3 col-form-label">{% trans "IPv4 Address" %}</label>
                                         <div class="col-sm-6">
-                                            <input type="text" class="form-control" name="ipv4_addr" maxlength="19" pattern="[0-9\.\/]+">
+                                            <input type="text" class="form-control" name="ipv4_addr" maxlength="19" pattern="[0-9\.\/]+|^$">
                                         </div>
                                     </div>
                                     <div class="row static_ipv4_form_group">
                                         <label class="col-sm-3 col-form-label">{% trans "IPv4 Gateway" %}</label>
                                         <div class="col-sm-6">
-                                            <input type="text" class="form-control" name="ipv4_gw" maxlength="16" pattern="[0-9\.]+">
+                                            <input type="text" class="form-control" name="ipv4_gw" maxlength="16" pattern="[0-9\.]+|^$">
                                         </div>
                                     </div>
                                 </div>
@@ -121,13 +121,13 @@
                                     <div class="row static_ipv6_form_group">
                                         <label class="col-sm-3 col-form-label">{% trans "IPv6 Address" %}</label>
                                         <div class="col-sm-6">
-                                            <input type="text" class="form-control" name="ipv6_addr" maxlength="100" pattern="[0-9a-f\:\/]+">
+                                            <input type="text" class="form-control" name="ipv6_addr" maxlength="100" pattern="[0-9a-f\:\/]+|^$">
                                         </div>
                                     </div>
                                     <div class="row static_ipv6_form_group">
                                         <label class="col-sm-3 col-form-label">{% trans "IPv6 Gateway" %}</label>
                                         <div class="col-sm-6">
-                                            <input type="text" class="form-control" name="ipv6_gw" maxlength="100" pattern="[0-9a-f\:]+">
+                                            <input type="text" class="form-control" name="ipv6_gw" maxlength="100" pattern="[0-9a-f\:]+|^$">
                                         </div>
                                     </div>
                                 </div>