mirror of
https://github.com/retspen/webvirtcloud
synced 2025-07-31 12:41:08 +00:00
Templates cleanup
This commit is contained in:
Real-Gecko
parent
4f959eaee8
commit
01043ba8a8
42 changed files with 307 additions and 796 deletions
|
|
@ -1,13 +1,14 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}{% trans "Network" %} - {{ pool }}{% endblock %}
|
||||
|
||||
{% block page_heading %}{% trans "Network" %}: {{ pool }}{% endblock page_heading %}
|
||||
|
||||
{% block content %}
|
||||
<!-- Page Heading -->
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h2 class="page-header">{% trans "Network" %}: {{ pool }}</h2>
|
||||
|
||||
<ol class="breadcrumb bg-light shadow-sm">
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{% url 'overview' compute.id %}"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</a>
|
||||
|
|
@ -34,9 +35,6 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.row -->
|
||||
|
||||
{% include 'errors_block.html' %}
|
||||
|
||||
<div class="row">
|
||||
<dl class="ml-3 row">
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
{% block title %}{% trans "Networks" %} - {{ compute.name }}{% endblock %}
|
||||
|
||||
{% block title %}{{ compute.name }} - {% trans "Networks" %}{% endblock %}
|
||||
|
||||
{% block page_heading %}{{ compute.name }} - {% trans "Networks" %}{% endblock page_heading %}
|
||||
|
||||
{% block page_heading_extra %}{% include 'create_net_block.html' %}{% endblock page_heading_extra %}
|
||||
|
||||
{% block content %}
|
||||
<!-- Page Heading -->
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
{% include 'create_net_block.html' %}
|
||||
<h2 class="page-header">{{ compute.name }} - {% trans "Networks" %}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<nav aria-label="breadcrumb">
|
||||
|
|
@ -38,9 +37,6 @@
|
|||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.row -->
|
||||
|
||||
{% include 'errors_block.html' %}
|
||||
|
||||
<div class="row">
|
||||
{% if not networks %}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ def networks(request, compute_id):
|
|||
:return:
|
||||
"""
|
||||
|
||||
error_messages = []
|
||||
compute = get_object_or_404(Compute, pk=compute_id)
|
||||
errors = False
|
||||
|
||||
try:
|
||||
conn = wvmNetworks(
|
||||
|
|
@ -41,9 +41,11 @@ def networks(request, compute_id):
|
|||
data = form.cleaned_data
|
||||
if data['name'] in networks:
|
||||
msg = _("Network pool name already in use")
|
||||
error_messages.append(msg)
|
||||
messages.error(request, msg)
|
||||
errors = True
|
||||
if data['forward'] in ['bridge', 'macvtap'] and data['bridge_name'] == '':
|
||||
error_messages.append(_('Please enter bridge/dev 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'])
|
||||
|
|
@ -51,8 +53,9 @@ def networks(request, compute_id):
|
|||
ipv6 = True
|
||||
gateway6, prefix6, dhcp6 = network_size(data['subnet6'], data['dhcp6'])
|
||||
if prefix6 != '64':
|
||||
error_messages.append(_('For libvirt, the IPv6 network prefix must be /64'))
|
||||
if not error_messages:
|
||||
messages.error(request, _('For libvirt, the IPv6 network prefix must be /64'))
|
||||
errors = True
|
||||
if not errors:
|
||||
conn.create_network(
|
||||
data['name'],
|
||||
data['forward'],
|
||||
|
|
@ -71,10 +74,10 @@ def networks(request, compute_id):
|
|||
return HttpResponseRedirect(reverse('network', args=[compute_id, data['name']]))
|
||||
else:
|
||||
for msg_err in form.errors.values():
|
||||
error_messages.append(msg_err.as_text())
|
||||
messages.error(request, msg_err.as_text())
|
||||
conn.close()
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
|
||||
return render(request, 'networks.html', locals())
|
||||
|
||||
|
|
@ -88,7 +91,6 @@ def network(request, compute_id, pool):
|
|||
:return:
|
||||
"""
|
||||
|
||||
error_messages = []
|
||||
compute = get_object_or_404(Compute, pk=compute_id)
|
||||
|
||||
try:
|
||||
|
|
@ -125,7 +127,7 @@ def network(request, compute_id, pool):
|
|||
|
||||
xml = conn._XMLDesc(0)
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
return HttpResponseRedirect(reverse('networks', args=compute_id))
|
||||
|
||||
if request.method == 'POST':
|
||||
|
|
@ -134,31 +136,31 @@ def network(request, compute_id, pool):
|
|||
conn.start()
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
if 'stop' in request.POST:
|
||||
try:
|
||||
conn.stop()
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
if 'delete' in request.POST:
|
||||
try:
|
||||
conn.delete()
|
||||
return HttpResponseRedirect(reverse('networks', args=[compute_id]))
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
if 'set_autostart' in request.POST:
|
||||
try:
|
||||
conn.set_autostart(1)
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
if 'unset_autostart' in request.POST:
|
||||
try:
|
||||
conn.set_autostart(0)
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
if 'modify_fixed_address' in request.POST:
|
||||
name = request.POST.get('name', '')
|
||||
address = request.POST.get('address', '')
|
||||
|
|
@ -174,9 +176,9 @@ def network(request, compute_id, pool):
|
|||
messages.success(request, _(f"{family.upper()} Fixed Address Operation Completed."))
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
except ValueError as val_err:
|
||||
error_messages.append(val_err)
|
||||
messages.error(request, val_err)
|
||||
if 'delete_fixed_address' in request.POST:
|
||||
ip = request.POST.get('address', '')
|
||||
family = request.POST.get('family', 'ipv4')
|
||||
|
|
@ -192,7 +194,7 @@ def network(request, compute_id, pool):
|
|||
messages.success(request, _(f"{family.upper()} DHCP Range is Changed."))
|
||||
return HttpResponseRedirect(request.get_full_path())
|
||||
except libvirtError as lib_err:
|
||||
error_messages.append(lib_err)
|
||||
messages.error(request, lib_err)
|
||||
if 'edit_network' in request.POST:
|
||||
edit_xml = request.POST.get('edit_xml', '')
|
||||
if edit_xml:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue