virt-install: Fill in a bunch of --graphics spice options (bz 1110017)

This commit is contained in:
Cole Robinson
2015-04-11 16:56:27 -04:00
parent 9a789c19e2
commit 20d37422fe
6 changed files with 32 additions and 0 deletions
@@ -180,6 +180,13 @@
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
<graphics type="vnc" port="5950" keymap="ja" listen="1.2.3.4" passwd="foo"/>
<graphics type="spice" port="5950" tlsPort="5950" keymap="ja" listen="1.2.3.4"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="foo"/>
<streaming mode="bar"/>
<clipboard copypaste="yes"/>
<mouse mode="client"/>
<filetransfer enable="yes"/>
</graphics>
<serial type="tcp">
<source mode="bind" host="127.0.0.1" service="2222"/>
<protocol type="telnet"/>
+1
View File
@@ -549,6 +549,7 @@ c.add_compare(""" \
--graphics spice,keymap=none \
--graphics vnc,port=5950,listen=1.2.3.4,keymap=ja,password=foo \
--graphics spice,port=5950,tlsport=5950,listen=1.2.3.4,keymap=ja \
--graphics spice,image_compression=foo,streaming_mode=bar,clipboard_copypaste=yes,mouse_mode=client,filetransfer_enable=on \
\
--controller usb,model=ich9-ehci1,address=0:0:4.7,index=0 \
--controller usb,model=ich9-uhci1,address=0:0:4.0,index=0,master=0 \
@@ -39,6 +39,11 @@
<channel name="cursor" mode="any"/>
<channel name="playback" mode="insecure"/>
<channel name="display" mode="secure"/>
<image compression="auto_glz"/>
<streaming mode="filter"/>
<clipboard copypaste="yes"/>
<mouse mode="client"/>
<filetransfer enable="no"/>
</graphics>
</devices>
<seclabel type="static" model="selinux">
+5
View File
@@ -629,6 +629,11 @@ class XMLParseTest(unittest.TestCase):
check("channel_playback_mode", "any", "insecure")
check("passwdValidTo", "2010-04-09T15:51:00", "2011-01-07T19:08:00")
check("defaultMode", None, "secure")
check("image_compression", None, "auto_glz")
check("streaming_mode", None, "filter")
check("clipboard_copypaste", None, True)
check("mouse_mode", None, "client")
check("filetransfer_enable", None, False)
self._alter_compare(guest.get_xml_config(), outfile)
+8
View File
@@ -1751,6 +1751,14 @@ class ParserGraphics(VirtCLIParser):
self.set_param("connected", "connected")
self.set_param("defaultMode", "defaultMode")
self.set_param("image_compression", "image_compression")
self.set_param("streaming_mode", "streaming_mode")
self.set_param("clipboard_copypaste", "clipboard_copypaste",
is_onoff=True)
self.set_param("mouse_mode", "mouse_mode")
self.set_param("filetransfer_enable", "filetransfer_enable",
is_onoff=True)
def _parse(self, opts, inst):
if opts.fullopts == "none":
self.guest.skip_default_graphics = True
+6
View File
@@ -218,5 +218,11 @@ class VirtualGraphics(VirtualDevice):
def remove_listen(self, obj):
self._remove_child(obj)
# Spice bits
image_compression = XMLProperty("./image/@compression")
streaming_mode = XMLProperty("./streaming/@mode")
clipboard_copypaste = XMLProperty("./clipboard/@copypaste", is_yesno=True)
mouse_mode = XMLProperty("./mouse/@mode")
filetransfer_enable = XMLProperty("./filetransfer/@enable", is_yesno=True)
VirtualGraphics.register_type()