diff options
| author | Cole Robinson <crobinso@redhat.com> | 2016-06-12 11:09:15 -0400 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2016-06-12 11:09:15 -0400 |
| commit | 302a84a97dedf9458c4aeeedc3934c6a99566afb (patch) | |
| tree | a4e223ee24f8e0ce77b1ca5c67d8462230fecc9e | |
| parent | 31b8051525c48993d6b0f8f5f12475f5f54dce3d (diff) | |
| download | virt-manager-302a84a97dedf9458c4aeeedc3934c6a99566afb.tar.gz | |
virtinst: rename .seclabel->.seclabels
Since guest and disk can have multiple of these, make it clear
to callers
| -rw-r--r-- | tests/xmlparse.py | 8 | ||||
| -rw-r--r-- | virtinst/devicedisk.py | 2 | ||||
| -rw-r--r-- | virtinst/guest.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/xmlparse.py b/tests/xmlparse.py index 6db77db8..f380d067 100644 --- a/tests/xmlparse.py +++ b/tests/xmlparse.py @@ -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") diff --git a/virtinst/devicedisk.py b/virtinst/devicedisk.py index 392d68b1..4b56795c 100644 --- a/virtinst/devicedisk.py +++ b/virtinst/devicedisk.py @@ -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") ################################# diff --git a/virtinst/guest.py b/virtinst/guest.py index 490b90ba..73566bae 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -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) |