Add a proper 'Clock' class for building <clock> XML

Author: crobinso

virtinst/Clock.py

@@ -0,0 +1,40 @@
+#
+# Copyright 2010  Red Hat, Inc.
+# Cole Robinson <crobinso@redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free  Software Foundation; either version 2 of the License, or
+# (at your option)  any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA.
+
+class Clock(object):
+    """
+    Class for generating <clock> XML
+    """
+
+    def __init__(self, conn):
+        self.conn = conn
+
+        self._offset = None
+
+    def get_offset(self):
+        return self._offset
+    def set_offset(self, val):
+        self._offset = val
+    offset = property(get_offset, set_offset)
+
+    def get_xml_config(self):
+        if not self.offset:
+            return ""
+
+        return """  <clock offset="%s"/>""" % self.offset

virtinst/FullVirtGuest.py

@@ -86,10 +86,6 @@ def _get_input_device(self):
         dev.bus = bus
         return dev
 
-    def _get_clock_xml(self):
-        val = self._lookup_osdict_key("clock")
-        return """  <clock offset="%s"/>""" % val
-
     def _get_device_xml(self, install=True):
         emu_xml = ""
         if self.emulator is not None:
@@ -110,5 +106,8 @@ def _set_defaults(self, devlist_func):
                 disk.device == VirtualDisk.DEVICE_DISK):
                 disk.bus = disk_bus
 
+        if self.clock.offset == None:
+            self.clock.offset = self._lookup_osdict_key("clock")
+
         # Run this last, so we get first crack at disk attributes
         Guest._set_defaults(self, devlist_func)

virtinst/Guest.py

@@ -30,6 +30,7 @@
 import support
 from VirtualDevice import VirtualDevice
 from VirtualDisk import VirtualDisk
+from Clock import Clock
 
 import osdict
 from virtinst import _virtinst as _
@@ -109,9 +110,22 @@ def cpuset_str_to_tuple(conn, cpuset):
 
     def __init__(self, type=None, connection=None, hypervisorURI=None,
                  installer=None):
+
+        # Set up the connection, since it is fundamental for other init
+        self.conn = connection
+        if self.conn == None:
+            logging.debug("No conn passed to Guest, opening URI '%s'" % \
+                          hypervisorURI)
+            self.conn = libvirt.open(hypervisorURI)
+
+        if self.conn == None:
+            raise RuntimeError, _("Unable to connect to hypervisor, aborting "
+                                  "installation!")
+
         # We specifically ignore the 'type' parameter here, since
         # it has been replaced by installer.type, and child classes can
         # use it when creating a default installer.
+        ignore = type
         self._installer = installer
         self._name = None
         self._uuid = None
@@ -123,6 +137,7 @@ def __init__(self, type=None, connection=None, hypervisorURI=None,
         self._consolechild = None
         self._os_autodetect = False
         self._autostart = False
+        self._clock = Clock(self.conn)
         self.features = None
 
         self._os_type = None
@@ -155,15 +170,6 @@ def __init__(self, type=None, connection=None, hypervisorURI=None,
         self._default_console_assigned = None
         self._default_input_assigned = None
 
-        self.conn = connection
-        if self.conn == None:
-            logging.debug("No conn passed to Guest, opening URI '%s'" % \
-                          hypervisorURI)
-            self.conn = libvirt.open(hypervisorURI)
-        if self.conn == None:
-            raise RuntimeError, _("Unable to connect to hypervisor, aborting "
-                                  "installation!")
-
         self._caps = CapabilitiesParser.parse(self.conn.getCapabilities())
 
 
@@ -175,6 +181,10 @@ def set_installer(self, val):
         self._installer = val
     installer = property(get_installer, set_installer)
 
+    def get_clock(self):
+        return self._clock
+    clock = property(get_clock)
+
     # Domain name of the guest
     def get_name(self):
         return self._name
@@ -667,12 +677,14 @@ def _get_features_xml(self):
 
     def _get_clock_xml(self):
         """
-        Return <clock/> xml (currently only relevant for FV guests)
+        Return <clock/> xml
         """
-        return ""
+        return self.clock.get_xml_config()
 
     def _get_osblob(self, install):
-        """Return os, features, and clock xml (Implemented in subclass)"""
+        """
+        Return os, features, and clock xml (Implemented in subclass)
+        """
         xml = ""
 
         osxml = self.installer.get_install_xml(self, install)

virtinst/__init__.py

@@ -49,6 +49,7 @@ def _virtinst(msg):
 from ImageInstaller import ImageInstaller
 from CloneManager import CloneDesign
 from User import User
+from Clock import Clock
 import util
 import support
 
@@ -59,6 +60,6 @@ def _virtinst(msg):
            "VirtualDisk", "XenDisk", "FullVirtGuest", "ParaVirtGuest",
            "DistroInstaller", "PXEInstaller", "LiveCDInstaller",
            "ImportInstaller", "ImageInstaller", "CloneDesign", "Storage",
-           "User", "util", "support", "VirtualDevice",
+           "User", "util", "support", "VirtualDevice", "Clock",
            "VirtualHostDevice", "VirtualHostDeviceUSB", "VirtualVideoDevice",
            "VirtualHostDevicePCI", "VirtualCharDevice", "VirtualInputDevice"]