shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-03-08 04:58:29 +03:00
Code Issues Projects Releases Wiki Activity

virtinst: rename .seclabel->.seclabels

Browse Source 
Since guest and disk can have multiple of these, make it clear
to callers
This commit is contained in:
Cole Robinson 2016-06-12 11:09:15 -04:00
parent 31b8051525
commit 302a84a97d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/xmlparse.py
View File

@ -228,7 +228,7 @@ class XMLParseTest(unittest.TestCase):
def testSeclabel(self):
guest, outfile = self._get_test_content("change-seclabel")
check = self._make_checker(guest.seclabel[0])
check = self._make_checker(guest.seclabels[0])
check("type", "static", "none")
check("model", "selinux", "apparmor")
check("label", "foolabel", "barlabel")
@ -236,7 +236,7 @@ class XMLParseTest(unittest.TestCase):
check("baselabel", None, "baselabel")
check("relabel", None, False)
guest.remove_child(guest.seclabel[1])
guest.remove_child(guest.seclabels[1])
self._alter_compare(guest.get_xml_config(), outfile)
@ -259,7 +259,7 @@ class XMLParseTest(unittest.TestCase):
seclabel.type = "static"
seclabel.label = "frob"
self.assertTrue(
guest.seclabel[0].get_xml_config().startswith("<seclabel"))
guest.seclabels[0].get_xml_config().startswith("<seclabel"))
check = self._make_checker(guest.cpu)
check("model", None, "foobar")
@ -350,7 +350,7 @@ class XMLParseTest(unittest.TestCase):
check("removable", None, False, True)
disk = guest.get_devices("disk")[1]
check = self._make_checker(disk.seclabel[1])
check = self._make_checker(disk.seclabels[1])
check("model", "dac")
check("relabel", None, True)
check("label", None, "foo-my-label")

2
virtinst/devicedisk.py
View File

@ -752,7 +752,7 @@ class VirtualDisk(VirtualDevice):
iotune_wbs = XMLProperty("./iotune/write_bytes_sec", is_int=True)
iotune_wis = XMLProperty("./iotune/write_iops_sec", is_int=True)
seclabel = XMLChildProperty(_DiskSeclabel, relative_xpath="./source")
seclabels = XMLChildProperty(_DiskSeclabel, relative_xpath="./source")
#################################

4
virtinst/guest.py
View File

@ -106,7 +106,7 @@ class Guest(XMLBuilder):
"vcpus", "curvcpus", "vcpu_placement", "cpuset",
"numatune", "bootloader", "os", "idmap",
"features", "cpu", "clock", "on_poweroff", "on_reboot", "on_crash",
"resource", "pm", "emulator", "_devices", "seclabel"]
"resource", "pm", "emulator", "_devices", "seclabels"]
def __init__(self, *args, **kwargs):
XMLBuilder.__init__(self, *args, **kwargs)
@ -200,7 +200,7 @@ class Guest(XMLBuilder):
on_crash = XMLProperty("./on_crash", default_cb=lambda s: "restart")
on_lockfailure = XMLProperty("./on_lockfailure")
seclabel = XMLChildProperty(Seclabel)
seclabels = XMLChildProperty(Seclabel)
os = XMLChildProperty(OSXML, is_single=True)
features = XMLChildProperty(DomainFeatures, is_single=True)
clock = XMLChildProperty(Clock, is_single=True)