From dc58d48a33e1cd6a99377fa62df201dabb654fb4 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 15 Jul 2013 20:43:41 -0400 Subject: [PATCH] VirtualGraphics: Drop non-default __init__ params --- tests/utils.py | 9 +++++++-- tests/xmlconfig.py | 21 ++++++++++++++------- virtManager/addhardware.py | 21 ++++++++++----------- virtManager/create.py | 4 +++- virtinst/VirtualGraphics.py | 27 +-------------------------- 5 files changed, 35 insertions(+), 47 deletions(-) diff --git a/tests/utils.py b/tests/utils.py index 70722380d..3bb351a1c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -174,7 +174,10 @@ def get_basic_paravirt_guest(installer=None): g.memory = int(200 * 1024) g.maxmemory = int(400 * 1024) g.uuid = "12345678-1234-1234-1234-123456789012" - g.add_device(VirtualGraphics(_conn, "vnc", keymap="ja")) + gdev = VirtualGraphics(_conn) + gdev.type = "vnc" + gdev.keymap= "ja" + g.add_device(gdev) g.vcpus = 5 if installer: @@ -195,7 +198,9 @@ def get_basic_fullyvirt_guest(typ="xen", installer=None): g.maxmemory = int(400 * 1024) g.uuid = "12345678-1234-1234-1234-123456789012" g.cdrom = "/dev/loop0" - g.add_device(VirtualGraphics(_conn, "sdl")) + gdev = VirtualGraphics(_conn) + gdev.type = "sdl" + g.add_device(gdev) g.features['pae'] = 0 g.vcpus = 5 if installer: diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py index 5805b4fa8..3ed34c8be 100644 --- a/tests/xmlconfig.py +++ b/tests/xmlconfig.py @@ -472,11 +472,13 @@ class TestXMLConfig(unittest.TestCase): def testKVMKeymap(self): conn = utils.open_plainkvm(connver=10000) - g = virtinst.VirtualGraphics(conn, type="vnc") + g = virtinst.VirtualGraphics(conn) + g.type = "vnc" self.assertTrue(g.keymap is not None) conn = utils.open_plainkvm(connver=11000) - g = virtinst.VirtualGraphics(conn, type="vnc") + g = virtinst.VirtualGraphics(conn) + g.type = "vnc" self.assertTrue(g.keymap is None) @@ -836,19 +838,24 @@ class TestXMLConfig(unittest.TestCase): g.add_device(mdev1) # Check keymap autoconfig - gdev1 = virtinst.VirtualGraphics(g.conn, type="vnc") + gdev1 = virtinst.VirtualGraphics(g.conn) + gdev1.type = "vnc" self.assertTrue(gdev1.keymap is not None) gdev1.keymap = "en-us" # Check keymap None - gdev2 = virtinst.VirtualGraphics(g.conn, type="vnc") + gdev2 = virtinst.VirtualGraphics(g.conn) + gdev2.type = "vnc" gdev2.keymap = None - gdev3 = virtinst.VirtualGraphics(g.conn, type="sdl") - gdev4 = virtinst.VirtualGraphics(g.conn, type="spice") + gdev3 = virtinst.VirtualGraphics(g.conn) + gdev3.type = "sdl" + gdev4 = virtinst.VirtualGraphics(g.conn) + gdev4.type = "spice" gdev4.passwdValidTo = "foobar" - gdev5 = virtinst.VirtualGraphics(g.conn, type="sdl") + gdev5 = virtinst.VirtualGraphics(g.conn) + gdev5.type = "sdl" gdev5.xauth = "fooxauth" gdev5.display = "foodisplay" g.add_device(gdev1) diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py index da8eff9de..df8d4a251 100644 --- a/virtManager/addhardware.py +++ b/virtManager/addhardware.py @@ -1415,19 +1415,18 @@ class vmmAddHardware(vmmGObjectUI): self._dev = dev def validate_page_graphics(self): - graphics = self.get_config_graphics() - _type = {"vnc": virtinst.VirtualGraphics.TYPE_VNC, - "spice": virtinst.VirtualGraphics.TYPE_SPICE, - "sdl": virtinst.VirtualGraphics.TYPE_SDL}[graphics] + gtype = self.get_config_graphics() - self._dev = virtinst.VirtualGraphics(self.conn.get_backend(), - type=_type) try: - self._dev.port = self.get_config_graphics_port() - self._dev.tlsPort = self.get_config_graphics_tls_port() - self._dev.passwd = self.get_config_graphics_password() - self._dev.listen = self.get_config_graphics_address() - self._dev.keymap = self.get_config_keymap() + self._dev = virtinst.VirtualGraphics(self.conn.get_backend()) + self._dev.type = gtype + if gtype != "sdl": + self._dev.port = self.get_config_graphics_port() + self._dev.passwd = self.get_config_graphics_password() or None + self._dev.listen = self.get_config_graphics_address() + self._dev.keymap = self.get_config_keymap() + if gtype == "spice": + self._dev.tlsPort = self.get_config_graphics_tls_port() except ValueError, e: self.err.val_err(_("Graphics device parameter error"), e) diff --git a/virtManager/create.py b/virtManager/create.py index b65f6e354..8b8b79814 100644 --- a/virtManager/create.py +++ b/virtManager/create.py @@ -1401,7 +1401,9 @@ class vmmCreate(vmmGObjectUI): "Using VNC graphics.") gtype = virtinst.VirtualGraphics.TYPE_VNC - return virtinst.VirtualGraphics(guest.conn, type=gtype) + gdev = virtinst.VirtualGraphics(guest.conn) + gdev.type = gtype + return gdev def get_video_device(self, guest): if guest.installer.is_container(): diff --git a/virtinst/VirtualGraphics.py b/virtinst/VirtualGraphics.py index a6df73d0e..0dc0f88e2 100644 --- a/virtinst/VirtualGraphics.py +++ b/virtinst/VirtualGraphics.py @@ -112,36 +112,11 @@ class VirtualGraphics(VirtualDevice): return str(gtype).capitalize() - def __init__(self, conn, type=None, port=None, listen=None, passwd=None, - keymap=None, parsexml=None, - parsexmlnode=None, tlsPort=None, channels=None, - passwdValidTo=None): - # pylint: disable=W0622 - # Redefining built-in 'type', but it matches the XML so keep it + def __init__(self, conn, parsexml=None, parsexmlnode=None): VirtualDevice.__init__(self, conn, parsexml, parsexmlnode) self._local_keymap = -1 - if self._is_parse(): - return - - if type: - self.type = type - if port: - self.port = port - if tlsPort: - self.tlsPort = tlsPort - if keymap: - self.keymap = keymap - if listen: - self.listen = listen - if passwd: - self.passwd = passwd - if passwdValidTo: - self.passwdValidTo = passwdValidTo - if channels: - self.channels = channels - _XML_PROP_ORDER = ["type", "port", "tlsPort", "autoport", "keymap", "listen",