{% trans "Device:" %}
-{% trans "Forward:" %}
+{% trans "Device" %}:
+{% trans "Forward" %}:
{{ pool.device }}
@@ -81,6 +81,14 @@ $('.bridge_name_form_group_dhcp').show(); } }).change(); + + $('#enable_ipv6').change(function (eventObject) { + if ($(this).is(':checked')) { + $('.ipv6_group').show(); + } else { + $('.ipv6_group').hide(); + } + }).change(); }); {% endblock %} \ No newline at end of file diff --git a/networks/views.py b/networks/views.py index b71e75e..4d507b3 100644 --- a/networks/views.py +++ b/networks/views.py @@ -31,7 +31,9 @@ def networks(request, compute_id): compute.password, compute.type) networks = conn.get_networks_info() - dhcp4 = netmask = gateway = '' + dhcp4 = netmask4 = gateway4 = '' + dhcp6 = prefix6 = gateway6 = '' + ipv4 = ipv6 = False if request.method == 'POST': if 'create' in request.POST: @@ -39,15 +41,24 @@ def networks(request, compute_id): if form.is_valid(): data = form.cleaned_data if data['name'] in networks: - msg = _("Pool name already in use") + msg = _("Network pool name already in use") error_messages.append(msg) if data['forward'] == 'bridge' and data['bridge_name'] == '': error_messages.append('Please enter bridge name') if data['subnet']: - gateway, netmask, dhcp4 = network_size(data['subnet'], data['dhcp4']) + ipv4 = True + gateway4, netmask4, dhcp4 = network_size(data['subnet'], data['dhcp4']) + if data['subnet6']: + 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: - conn.create_network(data['name'], data['forward'], gateway, netmask, - dhcp4, data['bridge_name'], data['openvswitch'], data['fixed']) + conn.create_network(data['name'], + data['forward'], + ipv4, gateway4, netmask4, dhcp4, + ipv6, gateway6, prefix6, dhcp6, + data['bridge_name'], data['openvswitch'], data['fixed']) return HttpResponseRedirect(reverse('network', args=[compute_id, data['name']])) else: for msg_err in form.errors.values(): @@ -151,7 +162,7 @@ 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.".format(family)) + messages.success(request, "{} Fixed Address Operation Completed.".format(family.upper())) return HttpResponseRedirect(request.get_full_path()) except libvirtError as lib_err: error_messages.append(lib_err.message) @@ -161,7 +172,7 @@ 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, "{} Fixed Address is Deleted.".format(family)) + messages.success(request, "{} Fixed Address is Deleted.".format(family.upper())) return HttpResponseRedirect(request.get_full_path()) if 'modify_dhcp_range' in request.POST: range_start = request.POST.get('range_start', '') @@ -169,7 +180,7 @@ 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, "{} DHCP Range is Changed.".format(family)) + messages.success(request, "{} DHCP Range is Changed.".format(family.upper())) return HttpResponseRedirect(request.get_full_path()) except libvirtError as lib_err: error_messages.append(lib_err.message) diff --git a/vrtManager/network.py b/vrtManager/network.py index d077c05..ebe54af 100644 --- a/vrtManager/network.py +++ b/vrtManager/network.py @@ -7,14 +7,18 @@ from libvirt import VIR_NETWORK_UPDATE_COMMAND_ADD_LAST, VIR_NETWORK_UPDATE_COMM from libvirt import VIR_NETWORK_UPDATE_AFFECT_LIVE, VIR_NETWORK_UPDATE_AFFECT_CONFIG -def network_size(net, dhcp=None): +def network_size(subnet, dhcp=None): """ Func return gateway, mask and dhcp pool. """ - mask = IP(net).strNetmask() - addr = IP(net) - gateway = addr[1].strNormal() - dhcp_pool = [addr[2].strNormal(), addr[addr.len() - 2].strNormal()] + mask = IP(subnet).strNetmask() + addr = IP(subnet) + gateway = addr[1].strCompressed() + if addr.version() == 4: + dhcp_pool = [addr[2].strCompressed(), addr[addr.len() - 2].strCompressed()] + if addr.version() == 6: + mask = mask.lstrip('/') if '/' in mask else mask + dhcp_pool = [IP(addr[0].strCompressed() + hex(256)), IP(addr[0].strCompressed() + hex(512 - 1))] if dhcp: return gateway, mask, dhcp_pool else: @@ -30,15 +34,18 @@ class wvmNetworks(wvmConnect): net = self.get_network(network) net_status = net.isActive() net_bridge = net.bridgeName() - net_forwd = util.get_xml_path(net.XMLDesc(0), "/network/forward/@mode") + net_forward = util.get_xml_path(net.XMLDesc(0), "/network/forward/@mode") networks.append({'name': network, 'status': net_status, - 'device': net_bridge, 'forward': net_forwd}) + 'device': net_bridge, 'forward': net_forward}) return networks def define_network(self, xml): self.wvm.networkDefineXML(xml) - def create_network(self, name, forward, gateway, mask, dhcp4, bridge, openvswitch, fixed=False): + def create_network(self, name, forward, + ipv4, gateway, mask, dhcp4, + ipv6, gateway6, prefix6, dhcp6, + bridge, openvswitch, fixed=False): xml = """