shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-23 17:34:21 +03:00
Code Issues Projects Releases Wiki Activity

createnet: Fix XML editor error when dhcp fields are empty

Browse Source 
We need to handle the case when ip == None

https://bugzilla.redhat.com/show_bug.cgi?id=1726586

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2020-01-29 18:43:58 -05:00
parent 635073eef5
commit 5573aeb441
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
virtManager/createnet.py
View File

@ -370,31 +370,35 @@ class vmmCreateNetwork(vmmGObjectUI):
if self.get_config_ipv4_enable():
ip = self.get_config_ip4()
ipobj = net.ips.add_new()
ipobj.address = str(ip.network_address + 1)
ipobj.netmask = str(ip.netmask)
if ip:
ipobj.address = str(ip.network_address + 1)
ipobj.netmask = str(ip.netmask)
if self.get_config_dhcpv4_enable():
dhcpobj = ipobj.ranges.add_new()
dhcpobj.start = str(
self.get_config_dhcpv4_start().network_address
)
dhcpobj.end = str(self.get_config_dhcpv4_end().network_address)
start = self.get_config_dhcpv4_start()
end = self.get_config_dhcpv4_end()
if start:
dhcpobj.start = str(start.network_address)
if end:
dhcpobj.end = str(end.network_address)
if self.get_config_ipv6_enable():
ip = self.get_config_ip6()
ipobj = net.ips.add_new()
ipobj.family = "ipv6"
ipobj.address = str(ip.network_address + 1)
ipobj.prefix = str(ip.prefixlen)
if ip:
ipobj.address = str(ip.network_address + 1)
ipobj.prefix = str(ip.prefixlen)
if self.get_config_dhcpv6_enable():
dhcpobj = ipobj.ranges.add_new()
dhcpobj.start = str(
self.get_config_dhcpv6_start().network_address
)
dhcpobj.end = str(
self.get_config_dhcpv6_end().network_address
)
start = self.get_config_dhcpv6_start()
end = self.get_config_dhcpv6_end()
if start:
dhcpobj.start = str(start.network_address)
if end:
dhcpobj.end = str(end.network_address)
return net