added new feature: create and attach new volume to existing instance

move wvmCreate.get_cache_modes() to wvmConnect

add wvmConnect.get_busses(), wvmConnect.get_image_formats(), used in forms

add corresponding default values to settings (INSTANCE_VOLUME_DEFAULT_FORMAT INSTANCE_VOLUME_DEFAULT_BUS INSTANCE_VOLUME_DEFAULT_CACHE)

vrtManager/connection.py

@@ -380,6 +380,25 @@ class wvmConnect(object):
             interface.append(inface)
         return interface
 
+    def get_cache_modes(self):
+        """Get cache available modes"""
+        return {
+            'default': 'Default',
+            'none': 'Disabled',
+            'writethrough': 'Write through',
+            'writeback': 'Write back',
+            'directsync': 'Direct sync',  # since libvirt 0.9.5
+            'unsafe': 'Unsafe',  # since libvirt 0.9.7
+        }
+    
+    def get_busses(self):
+        """Get available busses"""
+        return [ 'ide', 'scsi', 'usb', 'virtio' ]
+
+    def get_image_formats(self):
+        """Get available image formats"""
+        return [ 'raw', 'qcow', 'qcow2' ]
+
     def get_iface(self, name):
         return self.wvm.interfaceLookupByName(name)
 

vrtManager/create.py

@@ -48,23 +48,12 @@ class wvmCreate(wvmConnect):
         """Get guest capabilities"""
         return util.get_xml_path(self.get_cap_xml(), "/capabilities/host/cpu/arch")
 
-    def get_cache_modes(self):
-        """Get cache available modes"""
-        return {
-            'default': 'Default',
-            'none': 'Disabled',
-            'writethrough': 'Write through',
-            'writeback': 'Write back',
-            'directsync': 'Direct sync',  # since libvirt 0.9.5
-            'unsafe': 'Unsafe',  # since libvirt 0.9.7
-        }
-
-    def create_volume(self, storage, name, size, format='qcow2', metadata=False):
+    def create_volume(self, storage, name, size, format='qcow2', metadata=False, image_extension='img'):
         size = int(size) * 1073741824
         stg = self.get_storage(storage)
         storage_type = util.get_xml_path(stg.XMLDesc(0), "/pool/@type")
         if storage_type == 'dir':
-            name += '.img'
+            name += '.' + image_extension
             alloc = 0
         else:
             alloc = size

vrtManager/instance.py

@@ -340,6 +340,22 @@ class wvmInstance(wvmConnect):
             xmldom = ElementTree.tostring(tree)
         self._defineXML(xmldom)
 
+    def attach_disk(self, source, target, sourcetype='file', type='disk', driver='qemu', subdriver='raw', cache='none', targetbus='ide'):
+        tree = ElementTree.fromstring(self._XMLDesc(0))
+        xml_disk = """
+        <disk type='%s' device='%s'>
+          <driver name='%s' type='%s' cache='%s'/>
+          <source file='%s'/>
+          <target dev='%s' bus='%s'/>
+        </disk>
+        """ % (sourcetype, type, driver, subdriver, cache, source, target, targetbus)
+        if self.get_status() == 5:
+            devices = tree.find('devices')
+            elm_disk = ElementTree.fromstring(xml_disk)
+            devices.append(elm_disk)
+            xmldom = ElementTree.tostring(tree)
+            self._defineXML(xmldom)
+
     def cpu_usage(self):
         cpu_usage = {}
         if self.get_status() == 1: