arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1076 from GNS3/spice-feature

Browse Source 
Spice feature
This commit is contained in:
Julien Duponchelle 2017-06-21 10:28:43 +02:00 committed by GitHub
commit efd5d82c88
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gns3server/compute/qemu/qemu_vm.py
View File

@ -1304,6 +1304,14 @@ class QemuVM(BaseNode):
else: else:
return [] return []
def _spice_options(self):
if self._console:
return ["-spice",
"addr={},port={},disable-ticketing".format(self._manager.port_manager.console_host, self._console)]
else:
return []
def _monitor_options(self): def _monitor_options(self):
if self._monitor: if self._monitor:
@ -1563,6 +1571,8 @@ class QemuVM(BaseNode):
command.extend(self._serial_options()) command.extend(self._serial_options())
elif self._console_type == "vnc": elif self._console_type == "vnc":
command.extend(self._vnc_options()) command.extend(self._vnc_options())
elif self._console_type == "spice":
command.extend(self._spice_options())
else: else:
raise QemuError("Console type {} is unknown".format(self._console_type)) raise QemuError("Console type {} is unknown".format(self._console_type))
command.extend(self._monitor_options()) command.extend(self._monitor_options())

2
gns3server/schemas/node.py
View File

@ -144,7 +144,7 @@ NODE_OBJECT_SCHEMA = {
}, },
"console_type": { "console_type": {
"description": "Console type", "description": "Console type",
"enum": ["vnc", "telnet", "http", None] "enum": ["vnc", "telnet", "http", "spice", None]
}, },
"properties": { "properties": {
"description": "Properties specific to an emulator", "description": "Properties specific to an emulator",

6
gns3server/schemas/qemu.py
View File

@ -63,7 +63,7 @@ QEMU_CREATE_SCHEMA = {
}, },
"console_type": { "console_type": {
"description": "Console type", "description": "Console type",
"enum": ["telnet", "vnc"] "enum": ["telnet", "vnc", "spice"]
}, },
"hda_disk_image": { "hda_disk_image": {
"description": "QEMU hda disk image path", "description": "QEMU hda disk image path",
@ -244,7 +244,7 @@ QEMU_UPDATE_SCHEMA = {
}, },
"console_type": { "console_type": {
"description": "Console type", "description": "Console type",
"enum": ["telnet", "vnc"] "enum": ["telnet", "vnc", "spice"]
}, },
"linked_clone": { "linked_clone": {
"description": "Whether the VM is a linked clone or not", "description": "Whether the VM is a linked clone or not",
@ -541,7 +541,7 @@ QEMU_OBJECT_SCHEMA = {
}, },
"console_type": { "console_type": {
"description": "Console type", "description": "Console type",
"enum": ["telnet", "vnc"] "enum": ["telnet", "vnc", "spice"]
}, },
"initrd": { "initrd": {
"description": "QEMU initrd path", "description": "QEMU initrd path",

14
tests/compute/qemu/test_qemu_vm.py
View File

@ -359,6 +359,20 @@ def test_bios_option(vm, tmpdir, loop, fake_qemu_img_binary):
assert ' '.join(['-bios', str(tmpdir / "test.img")]) in ' '.join(options) assert ' '.join(['-bios', str(tmpdir / "test.img")]) in ' '.join(options)
def test_vnc_option(vm, tmpdir, loop, fake_qemu_img_binary):
vm._console_type = 'vnc'
vm._console = 5905
options = loop.run_until_complete(asyncio.async(vm._build_command()))
assert '-vnc 127.0.0.1:5' in ' '.join(options)
def test_spice_option(vm, tmpdir, loop, fake_qemu_img_binary):
vm._console_type = 'spice'
vm._console = 5905
options = loop.run_until_complete(asyncio.async(vm._build_command()))
assert '-spice addr=127.0.0.1,port=5905,disable-ticketing' in ' '.join(options)
def test_disk_options_multiple_disk(vm, tmpdir, loop, fake_qemu_img_binary): def test_disk_options_multiple_disk(vm, tmpdir, loop, fake_qemu_img_binary):
vm._hda_disk_image = str(tmpdir / "test0.qcow2") vm._hda_disk_image = str(tmpdir / "test0.qcow2")