Add VirtualControll module

Author: crobinso

tests/xmlconfig-xml/boot-many-devices.xml

@@ -38,6 +38,8 @@
       <source file='/default-pool/testvol1.img'/>
       <target dev='sdb' bus='scsi'/>
     </disk>
+    <controller type='ide' index='3'/>
+    <controller type='virtio-serial' index='0' ports='32' vectors='17'/>
     <interface type='network'>
       <source network='default'/>
       <mac address='11:22:33:44:55:66'/>

tests/xmlconfig.py

@@ -26,6 +26,7 @@
 from virtinst import VirtualHostDeviceUSB, VirtualHostDevicePCI
 from virtinst import VirtualCharDevice
 from virtinst import VirtualVideoDevice
+from virtinst import VirtualController
 import tests
 
 conn = tests.open_testdriver()
@@ -629,6 +630,15 @@ def testManyDevices(self):
                          bus="scsi", driverName="qemu")
         g.disks.append(d3)
 
+        # Controller devices
+        c1 = VirtualController.get_class_for_type(VirtualController.CONTROLLER_TYPE_IDE)(g.conn)
+        c1.index = "3"
+        c2 = VirtualController.get_class_for_type(VirtualController.CONTROLLER_TYPE_VIRTIOSERIAL)(g.conn)
+        c2.ports = "32"
+        c2.vectors = "17"
+        g.add_device(c1)
+        g.add_device(c2)
+
         # Network devices
         net1 = get_virtual_network()
         net1.model = "e1000"

virtinst/VirtualController.py

@@ -0,0 +1,118 @@
+#
+# 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.
+
+import VirtualDevice
+#from virtinst import _virtinst as _
+
+class VirtualController(VirtualDevice.VirtualDevice):
+
+    _virtual_device_type = VirtualDevice.VirtualDevice.VIRTUAL_DEV_CONTROLLER
+
+    CONTROLLER_TYPE_IDE             = "ide"
+    CONTROLLER_TYPE_FDC             = "fdc"
+    CONTROLLER_TYPE_SCSI            = "scsi"
+    CONTROLLER_TYPE_SATA            = "sata"
+    CONTROLLER_TYPE_VIRTIOSERIAL    = "virtio-serial"
+    CONTROLLER_TYPES = [CONTROLLER_TYPE_IDE, CONTROLLER_TYPE_FDC,
+                        CONTROLLER_TYPE_SCSI, CONTROLLER_TYPE_SATA,
+                        CONTROLLER_TYPE_VIRTIOSERIAL ]
+
+    @staticmethod
+    def get_class_for_type(ctype):
+        if ctype not in VirtualController.CONTROLLER_TYPES:
+            raise ValueError("Unknown controller type '%s'" % ctype)
+
+        if ctype == VirtualController.CONTROLLER_TYPE_IDE:
+            return VirtualControllerIDE
+        elif ctype == VirtualController.CONTROLLER_TYPE_FDC:
+            return VirtualControllerFDC
+        elif ctype == VirtualController.CONTROLLER_TYPE_SCSI:
+            return VirtualControllerSCSI
+        elif ctype == VirtualController.CONTROLLER_TYPE_SATA:
+            return VirtualControllerSATA
+        elif ctype == VirtualController.CONTROLLER_TYPE_VIRTIOSERIAL:
+            return VirtualControllerVirtioSerial
+
+    _controller_type = None
+
+    def __init__(self, conn):
+        VirtualDevice.VirtualDevice.__init__(self, conn)
+
+        self._index = 0
+
+    def get_type(self):
+        return self._controller_type
+    type = property(get_type)
+
+    def get_index(self):
+        return self._index
+    def set_index(self, val):
+        self._index = int(val)
+    index = property(get_index, set_index)
+
+    def _extra_config(self):
+        return ""
+
+    def get_xml_config(self):
+        extra = self._extra_config()
+
+        xml = "    <controller type='%s' index='%s'" % (self.type, self.index)
+        xml += extra
+        xml += "/>"
+
+        return xml
+
+
+class VirtualControllerIDE(VirtualController):
+    _controller_type = VirtualController.CONTROLLER_TYPE_IDE
+
+class VirtualControllerFDC(VirtualController):
+    _controller_type = VirtualController.CONTROLLER_TYPE_FDC
+
+class VirtualControllerSCSI(VirtualController):
+    _controller_type = VirtualController.CONTROLLER_TYPE_SCSI
+
+class VirtualControllerSATA(VirtualController):
+    _controller_type = VirtualController.CONTROLLER_TYPE_SATA
+
+class VirtualControllerVirtioSerial(VirtualController):
+    _controller_type = VirtualController.CONTROLLER_TYPE_VIRTIOSERIAL
+    _ports = 0
+    _vectors = 0
+
+    def get_vectors(self):
+        return self._vectors
+    def set_vectors(self, val):
+        self._vectors = val
+    vectors = property(get_vectors, set_vectors)
+
+    def get_ports(self):
+        return self._ports
+    def set_ports(self, val):
+        self._ports = val
+    ports = property(get_ports, set_ports)
+
+    def _extra_config(self):
+        xml = ""
+        if self.ports != None:
+            xml += " ports='%s'" % self.ports
+        if self.vectors != None:
+            xml += " vectors='%s'" % self.vectors
+
+        return xml

virtinst/VirtualDevice.py

@@ -40,10 +40,12 @@ class VirtualDevice(object):
     VIRTUAL_DEV_PARALLEL        = "parallel"
     VIRTUAL_DEV_CONSOLE         = "console"
     VIRTUAL_DEV_VIDEO           = "video"
+    VIRTUAL_DEV_CONTROLLER      = "controller"
 
     # Ordering in this list is important: it will be the order the
     # Guest class outputs XML. So changing this may upset the test suite
-    virtual_device_types = [VIRTUAL_DEV_DISK, VIRTUAL_DEV_NET,
+    virtual_device_types = [VIRTUAL_DEV_DISK, VIRTUAL_DEV_CONTROLLER,
+                            VIRTUAL_DEV_NET,
                             VIRTUAL_DEV_INPUT, VIRTUAL_DEV_GRAPHICS,
                             VIRTUAL_DEV_SERIAL, VIRTUAL_DEV_PARALLEL,
                             VIRTUAL_DEV_CONSOLE, VIRTUAL_DEV_AUDIO,

virtinst/__init__.py

@@ -41,6 +41,7 @@ def _virtinst(msg):
                                VirtualHostDevicePCI)
 from VirtualCharDevice import VirtualCharDevice
 from VirtualVideoDevice import VirtualVideoDevice
+from VirtualController import VirtualController
 from FullVirtGuest import FullVirtGuest
 from ParaVirtGuest import ParaVirtGuest
 from DistroInstaller import DistroInstaller
@@ -65,4 +66,5 @@ def _virtinst(msg):
            "Storage", "Interface",
            "User", "util", "support", "VirtualDevice", "Clock", "Seclabel",
            "VirtualHostDevice", "VirtualHostDeviceUSB", "VirtualVideoDevice",
-           "VirtualHostDevicePCI", "VirtualCharDevice", "VirtualInputDevice"]
+           "VirtualHostDevicePCI", "VirtualCharDevice", "VirtualInputDevice",
+           "VirtualController"]