VirtualGraphics: Parse pending vnc socket attribute

Not upstream yet, but if the attribute name changes it will be simple to
handle.

Author: crobinso

tests/xmlparse-xml/change-graphics-in.xml

@@ -26,7 +26,7 @@
     <graphics type="vnc" passwd="foobar" port="100" listen="0.0.0.0"/>
     <graphics type="sdl" xauth="/tmp/.Xauthority" display="1:2"/>
     <graphics type="rdp"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="vnc" port="-1" socket="/tmp/foobar"/>
     <graphics type="spice" passwd="foobar" port="100" tlsPort="101" listen="0.0.0.0" passwdValidTo="2010-04-09T15:51:00">
       <channel name='inputs' mode='insecure'/>
       <channel name='main' mode='secure'/>

tests/xmlparse-xml/change-graphics-out.xml

@@ -26,7 +26,7 @@
     <graphics type="vnc" passwd="newpass" port="6000" listen="1.2.3.4"/>
     <graphics type="sdl" xauth="fooauth" display="6:1"/>
     <graphics type="rdp"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="vnc" port="-1" socket="/var/lib/libvirt/socket/foo"/>
     <graphics type="spice" passwd="newpass" port="6000" tlsPort="6001" listen="1.2.3.4" passwdValidTo="2011-01-07T19:08:00">
       <channel name="inputs" mode="secure"/>
       <channel name="main" mode="any"/>

tests/xmlparse.py

@@ -434,6 +434,7 @@ def testAlterGraphics(self):
         check = self._make_checker(dev4)
         check("type", "vnc")
         check("port", -1)
+        check("socket", "/tmp/foobar", "/var/lib/libvirt/socket/foo")
 
         check = self._make_checker(dev5)
         check("type", "spice")

virtinst/VirtualGraphics.py

@@ -98,6 +98,7 @@ def __init__(self, type=TYPE_VNC, port=-1, listen=None, passwd=None,
         self._keymap = None
         self._xauth = None
         self._display = None
+        self._socket = None
         self._channels = {}
 
         if self._is_parse():
@@ -217,6 +218,13 @@ def set_passwdValidTo(self, val):
     passwdValidTo = _xml_property(get_passwdValidTo, set_passwdValidTo,
                                   xpath="./@passwdValidTo")
 
+    def _get_socket(self):
+        return self._socket
+    def _set_socket(self, val):
+        self._socket = val
+    socket = _xml_property(_get_socket, _set_socket,
+                           xpath="./@socket")
+
     def get_tlsPort(self):
         return self._tlsPort
     def set_tlsPort(self, val):
@@ -246,7 +254,7 @@ def set_tlsPort(self, val):
 
     def _build_xml(self, port=None, listen=None, keymap=None, passwd=None,
                    display=None, xauth=None, tlsPort=None, autoport=False,
-                   passwdValidTo=None):
+                   passwdValidTo=None, socket=None):
 
         doautoport = (autoport and (port == -1 or tlsPort == -1))
         portxml     = (port != None and (" port='%d'" % port) or "")
@@ -262,7 +270,7 @@ def _build_xml(self, port=None, listen=None, keymap=None, passwd=None,
         xauthxml    = (xauth and  (" xauth='%s'" % xauth) or "")
         displayxml  = (display and (" display='%s'" % display) or "")
 
-        #socketxml   = (socket and (" socket='%s'" % socket) or "")
+        socketxml   = (socket and (" socket='%s'" % socket) or "")
 
         xml = ("    " +
                "<graphics type='%s'" % self.type +
@@ -273,7 +281,7 @@ def _build_xml(self, port=None, listen=None, keymap=None, passwd=None,
                listenxml +
                passwdxml +
                passwdValidToxml +
-               #socketxml +
+               socketxml +
                displayxml +
                xauthxml +
                "/>")
@@ -297,7 +305,8 @@ def _spice_config(self):
     def _vnc_config(self):
         return self._build_xml(port=self.port, keymap=self.keymap,
                                passwd=self.passwd, listen=self.listen,
-                               passwdValidTo=self.passwdValidTo)
+                               passwdValidTo=self.passwdValidTo,
+                               socket=self.socket)
 
     def _get_xml_config(self):
         if self._type == self.TYPE_SDL: