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

xmlbuilder: Drop last remaining validate_cb usage

Browse Source 
Fold the interface bits into the existing validate() function
This commit is contained in:
Cole Robinson 2018-09-03 16:13:49 -04:00
parent 6711b538ef
commit 2e9a11b220
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
virtinst/interface.py
View File

@ -21,15 +21,7 @@ class _IPAddress(XMLBuilder):
_XML_PROP_ORDER = ["address", "prefix"]
XML_NAME = "ip"
######################
# Validation helpers #
######################
def _validate_ipaddr(self, addr):
ipaddress.ip_address(str(addr))
return addr
address = XMLProperty("./@address", validate_cb=_validate_ipaddr)
address = XMLProperty("./@address")
prefix = XMLProperty("./@prefix", is_int=True)
@ -167,10 +159,6 @@ class Interface(XMLBuilder):
raise ValueError(_("Name '%s' already in use by another interface.") %
name)
def _validate_mac(self, val):
util.validate_macaddr(val)
return val
##################
# General params #
@ -181,7 +169,7 @@ class Interface(XMLBuilder):
start_mode = XMLProperty("./start/@mode")
name = XMLProperty("./@name")
macaddr = XMLProperty("./mac/@address", validate_cb=_validate_mac)
macaddr = XMLProperty("./mac/@address")
def add_protocol(self, obj):
self.add_child(obj)
@ -228,6 +216,12 @@ class Interface(XMLBuilder):
def validate(self):
self.validate_name(self.conn, self.name)
if self.macaddr:
util.validate_macaddr(self.macaddr)
for protocol in self.protocols:
for ip in protocol.ips:
ipaddress.ip_address(ip.address)
if (self.type == self.INTERFACE_TYPE_VLAN and
(self.tag is None or self.parent_interface is None)):

13
virtinst/xmlbuilder.py
View File

@ -165,7 +165,7 @@ class XMLChildProperty(_XMLPropertyBase):
class XMLProperty(_XMLPropertyBase):
def __init__(self, xpath,
set_converter=None, validate_cb=None,
set_converter=None,
is_bool=False, is_int=False, is_yesno=False, is_onoff=False,
do_abspath=False):
"""
@ -189,8 +189,6 @@ class XMLProperty(_XMLPropertyBase):
the Guest.memory API was once in MiB, but the libvirt domain
memory API is in KiB. So, if xpath is specified, on a 'get'
operation we convert the XML value with int(val) / 1024.
:param validate_cb: Called once when value is set, should
raise a RuntimeError if the value is not proper.
:param is_bool: Whether this is a boolean property in the XML
:param is_int: Whether this is an integer property in the XML
:param is_yesno: Whether this is a yes/no property in the XML
@ -207,7 +205,6 @@ class XMLProperty(_XMLPropertyBase):
self._is_onoff = is_onoff
self._do_abspath = do_abspath
self._validate_cb = validate_cb
self._convert_value_for_setter_cb = set_converter
if sum([int(bool(i)) for i in
@ -322,7 +319,7 @@ class XMLProperty(_XMLPropertyBase):
return xmlbuilder._xmlstate.xmlapi.get_xpath_content(
xpath, self._is_bool)
def setter(self, xmlbuilder, val, validate=True):
def setter(self, xmlbuilder, val):
"""
Set the value at user request. This just stores the value
in propstore. Setting the actual XML is only done at
@ -332,10 +329,8 @@ class XMLProperty(_XMLPropertyBase):
_seenprops.append(self)
self._is_tracked = True
if validate and self._validate_cb:
self._validate_cb(xmlbuilder, val)
self._nonxml_fset(xmlbuilder,
self._convert_set_value(xmlbuilder, val))
setval = self._convert_set_value(xmlbuilder, val)
self._nonxml_fset(xmlbuilder, setval)
def _set_xml(self, xmlbuilder, setval):
"""