mirror of
https://github.com/retspen/webvirtcloud
synced 2025-07-31 12:41:08 +00:00
format python code with black
This commit is contained in:
catborise
parent
ea409ca863
commit
217e106c8b
55 changed files with 2510 additions and 1454 deletions
|
|
@ -1,12 +1,8 @@
|
|||
|
||||
from rest_framework import serializers
|
||||
from networks.models import Networks
|
||||
|
||||
|
||||
class NetworksSerializer(serializers.ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = Networks
|
||||
fields = ['name', 'status', 'device', 'forward']
|
||||
|
||||
|
||||
fields = ["name", "status", "device", "forward"]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,10 @@ from django.utils.translation import gettext_lazy as _
|
|||
|
||||
|
||||
class AddNetPool(forms.Form):
|
||||
name = forms.CharField(error_messages={"required": _("No pool name has been entered")}, max_length=20)
|
||||
name = forms.CharField(
|
||||
error_messages={"required": _("No pool name has been entered")},
|
||||
max_length=20
|
||||
)
|
||||
subnet = forms.CharField(
|
||||
error_messages={"required": _("No IPv4 subnet has been entered")},
|
||||
max_length=20,
|
||||
|
|
@ -27,27 +30,39 @@ class AddNetPool(forms.Form):
|
|||
name = self.cleaned_data["name"]
|
||||
have_symbol = re.match(r"^[a-zA-Z0-9\.\_\-]+$", name)
|
||||
if not have_symbol:
|
||||
raise forms.ValidationError(_("The pool name must not contain any special characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The pool name must not contain any special characters")
|
||||
)
|
||||
elif len(name) > 20:
|
||||
raise forms.ValidationError(_("The pool name must not exceed 20 characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The pool name must not exceed 20 characters")
|
||||
)
|
||||
return name
|
||||
|
||||
def clean_subnet(self):
|
||||
subnet = self.cleaned_data["subnet"]
|
||||
have_symbol = re.match("^[0-9./]+$", subnet if subnet else ".")
|
||||
if not have_symbol:
|
||||
raise forms.ValidationError(_("The IPv4 subnet must not contain any special characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The IPv4 subnet must not contain any special characters")
|
||||
)
|
||||
elif len(subnet) > 20:
|
||||
raise forms.ValidationError(_("The IPv4 subnet must not exceed 20 characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The IPv4 subnet must not exceed 20 characters")
|
||||
)
|
||||
return subnet
|
||||
|
||||
def clean_subnet6(self):
|
||||
subnet = self.cleaned_data["subnet6"]
|
||||
have_symbol = re.match("^[0-9a-fA-F:/]+$", subnet if subnet else ":")
|
||||
if not have_symbol:
|
||||
raise forms.ValidationError(_("The IPv6 subnet must not contain any special characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The IPv6 subnet must not contain any special characters")
|
||||
)
|
||||
elif len(subnet) > 42:
|
||||
raise forms.ValidationError(_("The IPv6 subnet must not exceed 42 characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The IPv6 subnet must not exceed 42 characters")
|
||||
)
|
||||
return subnet
|
||||
|
||||
def clean_bridge_name(self):
|
||||
|
|
@ -55,7 +70,11 @@ class AddNetPool(forms.Form):
|
|||
if self.cleaned_data["forward"] in ["bridge", "macvtap"]:
|
||||
have_symbol = re.match(r"^[a-zA-Z0-9\.\_\:\-]+$", bridge_name)
|
||||
if not have_symbol:
|
||||
raise forms.ValidationError(_("The pool bridge name must not contain any special characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The pool bridge name must not contain any special characters")
|
||||
)
|
||||
elif len(bridge_name) > 20:
|
||||
raise forms.ValidationError(_("The pool bridge name must not exceed 20 characters"))
|
||||
raise forms.ValidationError(
|
||||
_("The pool bridge name must not exceed 20 characters")
|
||||
)
|
||||
return bridge_name
|
||||
|
|
|
|||
|
|
@ -4,10 +4,14 @@ from django.utils.translation import gettext_lazy as _
|
|||
|
||||
# Create your models here.
|
||||
class Networks(models.Model):
|
||||
name = models.CharField(_('name'), max_length=20, error_messages={'required': _('No network name has been entered')})
|
||||
status = models.CharField(_('status'), max_length=12)
|
||||
device = models.CharField(_('device'), max_length=100)
|
||||
forward = models.CharField(_('forward'), max_length=24)
|
||||
name = models.CharField(
|
||||
_("name"),
|
||||
max_length=20,
|
||||
error_messages={"required": _("No network name has been entered")},
|
||||
)
|
||||
status = models.CharField(_("status"), max_length=12)
|
||||
device = models.CharField(_("device"), max_length=100)
|
||||
forward = models.CharField(_("forward"), max_length=24)
|
||||
|
||||
class Meta:
|
||||
managed = False
|
||||
|
|
|
|||
|
|
@ -43,18 +43,26 @@ def networks(request, compute_id):
|
|||
msg = _("Network pool name already in use")
|
||||
messages.error(request, msg)
|
||||
errors = True
|
||||
if data["forward"] in ["bridge", "macvtap"] and data["bridge_name"] == "":
|
||||
if (
|
||||
data["forward"] in ["bridge", "macvtap"]
|
||||
and data["bridge_name"] == ""
|
||||
):
|
||||
messages.error(request, _("Please enter bridge/dev name"))
|
||||
errors = True
|
||||
if data["subnet"]:
|
||||
ipv4 = True
|
||||
gateway4, netmask4, dhcp4 = network_size(data["subnet"], data["dhcp4"])
|
||||
gateway4, netmask4, dhcp4 = network_size(
|
||||
data["subnet"], data["dhcp4"]
|
||||
)
|
||||
if data["subnet6"]:
|
||||
ipv6 = True
|
||||
gateway6, prefix6, dhcp6 = network_size(data["subnet6"], data["dhcp6"])
|
||||
gateway6, prefix6, dhcp6 = network_size(
|
||||
data["subnet6"], data["dhcp6"]
|
||||
)
|
||||
if prefix6 != "64":
|
||||
messages.error(
|
||||
request, _("For libvirt, the IPv6 network prefix must be /64")
|
||||
request,
|
||||
_("For libvirt, the IPv6 network prefix must be /64"),
|
||||
)
|
||||
errors = True
|
||||
if not errors:
|
||||
|
|
@ -177,7 +185,11 @@ def network(request, compute_id, pool):
|
|||
|
||||
try:
|
||||
ret_val = conn.modify_fixed_address(name, address, mac_duid, family)
|
||||
messages.success(request, _("Fixed address operation completed for %(family)s") % {"family": family.upper()})
|
||||
messages.success(
|
||||
request,
|
||||
_("Fixed address operation completed for %(family)s")
|
||||
% {"family": family.upper()},
|
||||
)
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
messages.error(request, lib_err)
|
||||
|
|
@ -187,7 +199,10 @@ def network(request, compute_id, pool):
|
|||
ip = request.POST.get("address", "")
|
||||
family = request.POST.get("family", "ipv4")
|
||||
conn.delete_fixed_address(ip, family)
|
||||
messages.success(request, _("%(family)s Fixed Address is Deleted.") % {"family": family.upper()})
|
||||
messages.success(
|
||||
request,
|
||||
_("%(family)s Fixed Address is Deleted.") % {"family": family.upper()},
|
||||
)
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
if "modify_dhcp_range" in request.POST:
|
||||
range_start = request.POST.get("range_start", "")
|
||||
|
|
@ -195,7 +210,10 @@ def network(request, compute_id, pool):
|
|||
family = request.POST.get("family", "ipv4")
|
||||
try:
|
||||
conn.modify_dhcp_range(range_start, range_end, family)
|
||||
messages.success(request, _("%(family)s DHCP Range is Changed.") % {"family": family.upper()})
|
||||
messages.success(
|
||||
request,
|
||||
_("%(family)s DHCP Range is Changed.") % {"family": family.upper()},
|
||||
)
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
messages.error(request, lib_err)
|
||||
|
|
@ -225,10 +243,16 @@ def network(request, compute_id, pool):
|
|||
if conn.is_active():
|
||||
messages.success(
|
||||
request,
|
||||
_("%(qos_dir)s QoS is updated. Network XML is changed. Stop and start network to activate new config") % {"qos_dir": qos_dir.capitalize()}
|
||||
_(
|
||||
"%(qos_dir)s QoS is updated. Network XML is changed. Stop and start network to activate new config"
|
||||
)
|
||||
% {"qos_dir": qos_dir.capitalize()},
|
||||
)
|
||||
else:
|
||||
messages.success(request, _("%(qos_dir)s QoS is set") % {"qos_dir": qos_dir.capitalize()})
|
||||
messages.success(
|
||||
request,
|
||||
_("%(qos_dir)s QoS is set") % {"qos_dir": qos_dir.capitalize()},
|
||||
)
|
||||
except libvirtError as lib_err:
|
||||
messages.error(request, lib_err)
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
|
|
@ -239,11 +263,17 @@ def network(request, compute_id, pool):
|
|||
if conn.is_active():
|
||||
messages.success(
|
||||
request,
|
||||
_("%(qos_dir)s QoS is deleted. Network XML is changed. \
|
||||
Stop and start network to activate new config") % {"qos_dir": qos_dir.capitalize()}
|
||||
_(
|
||||
"%(qos_dir)s QoS is deleted. Network XML is changed. \
|
||||
Stop and start network to activate new config"
|
||||
)
|
||||
% {"qos_dir": qos_dir.capitalize()},
|
||||
)
|
||||
else:
|
||||
messages.success(request, _("%(qos_dir)s QoS is deleted") % {"qos_dir": qos_dir.capitalize()})
|
||||
messages.success(
|
||||
request,
|
||||
_("%(qos_dir)s QoS is deleted") % {"qos_dir": qos_dir.capitalize()},
|
||||
)
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
conn.close()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue