File virtman-edit.diff of Package virt-manager

Overview Repositories Revisions Requests Users Attributes Meta

File virtman-edit.diff of Package virt-manager (Revision c48d5dbb7cd89c98b12ebb122b4ede48)

Currently displaying revision c48d5dbb7cd89c98b12ebb122b4ede48 , Show latest

Index: virt-manager--devel/src/virtManager/details.py
===================================================================
--- virt-manager--devel.orig/src/virtManager/details.py
+++ virt-manager--devel/src/virtManager/details.py
@@ -24,6 +24,12 @@ import libvirt
 import sparkline
 import logging
 import traceback
+import os
+from subprocess import *
+
+import vmdisks
+import vminstall
+from vminstall.gtk.disk_widgets import DisksWidget, DiskEditWidget
 
 from virtManager.error import vmmErrorDialog
 from virtManager.addhardware import vmmAddHardware
@@ -31,6 +37,17 @@ from virtManager.addhardware import vmmA
 import virtinst
 import urlgrabber.progress as progress
 
+def run(args):
+    try:
+        p = Popen(args=args, stdin=None, stdout=PIPE, stderr=STDOUT, close_fds=True)
+        (pid, status) = os.waitpid(p.pid, 0)
+        output = p.stdout.read()
+        if status:
+            raise RuntimeError(output)
+    except OSError, e:
+        raise RuntimeError(str(e))
+    return output
+
 # Columns in hw list model
 HW_LIST_COL_LABEL = 0
 HW_LIST_COL_STOCK_ID = 1
@@ -69,12 +86,7 @@ class vmmDetails(gobject.GObject):
         topwin = self.window.get_widget("vmm-details")
         topwin.hide()
         topwin.set_title(self.vm.get_name() + " " + topwin.get_title())
-
-        # Don't allowing changing network/disks for Dom0
-        if self.vm.is_management_domain():
-            self.window.get_widget("add-hardware-button").set_sensitive(False)
-        else:
-            self.window.get_widget("add-hardware-button").set_sensitive(True)
+        self.topwin = topwin
 
         self.window.get_widget("overview-name").set_text(self.vm.get_name())
         self.window.get_widget("overview-uuid").set_text(self.vm.get_uuid())
@@ -119,10 +131,6 @@ class vmmDetails(gobject.GObject):
             "on_config_maxmem_changed": self.config_maxmem_changed,
             "on_config_memory_apply_clicked": self.config_memory_apply,
             "on_details_help_activate": self.show_help,
-
-            "on_config_disk_remove_clicked": self.remove_disk,
-            "on_config_network_remove_clicked": self.remove_network,
-            "on_add_hardware_button_clicked": self.add_hardware,
             })
 
         self.vm.connect("status-changed", self.update_widget_states)
@@ -166,11 +174,11 @@ class vmmDetails(gobject.GObject):
         self.window.get_widget("details-pages").set_current_page(1)
 
     def close(self,ignore1=None,ignore2=None):
-        self.window.get_widget("vmm-details").hide()
+        self.topwin.hide()
         return 1
 
     def is_visible(self):
-        if self.window.get_widget("vmm-details").flags() & gtk.VISIBLE:
+        if self.topwin.flags() & gtk.VISIBLE:
            return 1
         return 0
 
@@ -192,10 +200,10 @@ class vmmDetails(gobject.GObject):
                 self.refresh_config_memory()
                 pagenum = 1
             elif pagetype == HW_LIST_TYPE_DISK:
-                self.refresh_disk_page()
+                self.populate_disk_list()
                 pagenum = 2
             elif pagetype == HW_LIST_TYPE_NIC:
-                self.refresh_network_page()
+                self.populate_network_list()
                 pagenum = 3
 
             self.window.get_widget("hw-panel").set_current_page(pagenum)
@@ -328,9 +336,6 @@ class vmmDetails(gobject.GObject):
         if details.get_current_page() == 0:
             self.refresh_summary()
         else:
-            # Add / remove new devices
-            self.repopulate_hw_list()
-
             # Now refresh desired page
             hw_list = self.window.get_widget("hw-list")
             selection = hw_list.get_selection()
@@ -343,10 +348,10 @@ class vmmDetails(gobject.GObject):
                     self.refresh_config_cpu()
                 elif pagetype == HW_LIST_TYPE_MEMORY:
                     self.refresh_config_memory()
-                elif pagetype == HW_LIST_TYPE_DISK:
-                    self.refresh_disk_page()
-                elif pagetype == HW_LIST_TYPE_NIC:
-                    self.refresh_network_page()
+                #elif pagetype == HW_LIST_TYPE_DISK:
+                #    self.refresh_disk_page()
+                #elif pagetype == HW_LIST_TYPE_NIC:
+                #    self.refresh_network_page()
 
     def refresh_summary(self):
         self.window.get_widget("overview-cpu-usage-text").set_text("%d %%" % self.vm.cpu_time_percentage())
@@ -400,18 +405,6 @@ class vmmDetails(gobject.GObject):
 
         self.window.get_widget("state-vm-memory").set_text("%d MB" % (self.vm.get_memory()/1024))
 
-    def refresh_disk_page(self):
-        # get the currently selected line
-        vmlist = self.window.get_widget("hw-list")
-        selection = vmlist.get_selection()
-        active = selection.get_selected()
-        if active[1] != None:
-            diskinfo = active[0].get_value(active[1], HW_LIST_COL_DEVICE)
-            self.window.get_widget("disk-source-type").set_text(diskinfo[0])
-            self.window.get_widget("disk-source-path").set_text(diskinfo[1])
-            self.window.get_widget("disk-target-type").set_text(diskinfo[2])
-            self.window.get_widget("disk-target-device").set_text(diskinfo[3])
-
     def refresh_network_page(self):
         vmlist = self.window.get_widget("hw-list")
         selection = vmlist.get_selection()
@@ -458,36 +451,232 @@ class vmmDetails(gobject.GObject):
         self.window.get_widget("config-memory-apply").set_sensitive(False)
 
 
-    def remove_disk(self, src):
-        vmlist = self.window.get_widget("hw-list")
-        selection = vmlist.get_selection()
-        active = selection.get_selected()
-        if active[1] != None:
-            diskinfo = active[0].get_value(active[1], HW_LIST_COL_DEVICE)
-
-            vbd = virtinst.VirtualDisk(path=diskinfo[1], type=diskinfo[0], device=diskinfo[2])
-            xml = vbd.get_xml_config(diskinfo[3])
-
-            self.vm.remove_device(xml)
-
-    def remove_network(self, src):
-        vmlist = self.window.get_widget("hw-list")
-        selection = vmlist.get_selection()
-        active = selection.get_selected()
-        if active[1] != None:
-            netinfo = active[0].get_value(active[1], HW_LIST_COL_DEVICE)
-
-            vnic = None
-            if netinfo[0] == "bridge":
-                vnic = virtinst.VirtualNetworkInterface(type=netinfo[0], bridge=netinfo[1], macaddr=netinfo[3])
-            elif netinfo[0] == "network":
-                vnic = virtinst.VirtualNetworkInterface(type=netinfo[0], network=netinfo[1], macaddr=netinfo[3])
+    def get_disk_editor(self):
+        w = gtk.Window()
+        w.set_modal(True)
+        w.set_transient_for(self.topwin)
+        w.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
+        w.set_title(vminstall.msg.title_disk)
+        w.set_border_width(10)
+        disk_editor = DiskEditWidget()
+        vbox = gtk.VBox()
+        w.add(vbox)
+        vbox.pack_start(disk_editor.get_widget(), False)
+        bbox = gtk.HButtonBox()
+        bbox.set_layout(gtk.BUTTONBOX_END)
+        cancel_button = gtk.Button(stock=gtk.STOCK_CANCEL)
+        bbox.pack_start(cancel_button)
+        ok_button = gtk.Button(stock=gtk.STOCK_OK)
+        bbox.pack_start(ok_button)
+        vbox.pack_start(bbox, False)
+        w.show_all()
+        w.present()
+        def _cancel_disk(button):
+            w.destroy()
+        cancel_button.connect("clicked", _cancel_disk)
+        return (w, disk_editor, ok_button)
+
+    def error_box(self, parent, text=vminstall.msg.error):
+        parent.present()
+        message_box = gtk.MessageDialog(parent, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text)
+        message_box.run()
+        message_box.destroy()
+
+    def add_cdrom(self, button):
+        return self.add_disk(True)
+    def add_harddisk(self, button):
+        return self.add_disk(False)
+    def add_disk(self, is_cdrom):
+        disks = self.disks_widget.get_disks()
+        unused_vdevs = vmdisks.get_unused_vdevs(self.options.full_virt, disks)
+        if len(unused_vdevs) == 0:
+            return
+        (w, disk_editor, ok_button) = self.get_disk_editor()
+        def _add_disk(button):
+            try:
+                disk = disk_editor.get()
+                self.xen_add_disk(disk)
+            except vminstall.DiskResourceError, e:
+                self.error_box(w, e.title)
+            except:
+                self.error_box(w)
+            else:
+                disks.append(disk)
+                self.disks_widget.set_disks(disks)
+            w.destroy()
+        ok_button.connect("clicked", _add_disk)
+        if is_cdrom:
+            cdrom = disk_editor.default_cdrom()
+            disk = vmdisks.Disk(pdev=cdrom, vdev=unused_vdevs[0],
+                                vdevType=vmdisks.Disk.DEVICE_CDROM,
+                                full_virt=self.options.full_virt, vmname=self.options.vmname, disk_group=disks)
+        else:
+            disk = vmdisks.Disk(pdev=None, vdev=unused_vdevs[0],
+                                vdevType=vmdisks.Disk.DEVICE_DISK,
+                                args={'sparse':True},
+                                full_virt=self.options.full_virt, vmname=self.options.vmname, disk_group=disks)
+        disk_editor.set(disk)
+
+    def edit_disk(self, button):
+        (disk, index) = self.disks_widget.get_selected()
+        (w, disk_editor, ok_button) = self.get_disk_editor()
+        disk_editor.set(disk)
+        def _edit_disk(button):
+            try:
+                disk = disk_editor.get()
+                self.xen_edit_disk(disk)
+            except vminstall.DiskResourceError, e:
+                self.error_box(w, e.title)
+            except:
+                self.error_box(w)
             else:
-                vnic = virtinst.VirtualNetworkInterface(type=netinfo[0], macaddr=netinfo[3])
+                self.disks_widget.set_index(index, disk)
+            w.destroy()
+        ok_button.connect("clicked", _edit_disk)
+        disk_editor.set(disk)
+
+    def xen_add_disk(self, disk):
+        disk.setup()
+        if self.vm.is_active():
+            mode = 'w'
+            if disk.ro:
+                mode = 'r'
+            vdev = disk.get_vdev_str()
+            if disk.get_vdevtype() == disk.DEVICE_CDROM:
+                vdev += ':cdrom'
+            try:
+                run(['/usr/sbin/xm', 'block-attach', str(self.vm.get_id()),
+                     disk.get_pdev(), vdev, mode])
+            except RuntimeError, e:
+                logging.error("Failed to attach disk: %s" % str(e))
+                raise
+        else:
+            raise NotImplementedError
 
-            xml = vnic.get_xml_config()
-            self.vm.remove_device(xml)
+    def xen_remove_disk(self, disk):
+        if self.vm.is_active():
+            try:
+                run(['/usr/sbin/xm', 'block-detach', str(self.vm.get_id()), disk.vdev, '-f'])
+            except RuntimeError, e:
+                logging.error("Failed to remove disk: %s" % str(e))
+                raise
+        else:
+            raise NotImplementedError
 
+    def xen_edit_disk(self, disk):
+        if self.vm.is_active():
+            try:
+                from xen.util import blkif
+                devid = blkif.blkdev_name_to_number(disk.get_vdev_str())
+                run(['/usr/bin/xenstore-write',
+                     '/local/domain/0/backend/vbd/%d/%d/params' % (self.vm.get_id(), devid),
+                     disk.get_path()])
+            except RuntimeError, e:
+                logging.error("Failed to change CD media: %s" % str(e))
+                raise
+        else:
+            raise NotImplementedError
+
+    def disk_selected(self, src=None):
+        (disk, index) = self.disks_widget.get_selected()
+        # FIXME:  Abstract access to the buttons
+        def button(name):
+            return self.disks_widget.glade.get_widget(name)
+        cdrom_button = button('button-new-cdrom')
+        disk_button = button('button-new-harddisk')
+        edit_button = button('button-edit-disk')
+        remove_button = button('button-delete-disk')
+        active = self.vm.is_active()
+        cdrom_button.set_sensitive(active)
+        disk_button.set_sensitive(active)
+        if disk is None:
+            edit_button.set_sensitive(False)
+            remove_button.set_sensitive(False)
+        else:
+            edit_button.set_sensitive(active and disk.get_vdevtype() == disk.DEVICE_CDROM)
+            remove_button.set_sensitive(active)
+
+    def prepare_disk_list(self):
+        self.disks_widget = DisksWidget(allow_reorder=False,
+                                        add_cdrom_fn=self.add_cdrom,
+                                        add_harddisk_fn=self.add_harddisk,
+                                        edit_fn=self.edit_disk,
+                                        remove_fn=self.xen_remove_disk)
+        notebook = self.window.get_widget("hw-panel")
+        notebook.remove_page(2)
+        notebook.insert_page(self.disks_widget.get_widget(), None, 2)
+        self.disks_widget.disks_view.view.get_selection().connect("changed", self.disk_selected)
+        class Options:
+            pass
+        self.options = Options()
+        self.options.vmname = self.vm.get_name()
+        # This is to work around a libvirt bug; once libvirt is updated,
+        # remove this.  If the VM is not running, libvirt assumes it is
+        # paravirtual.  This can cause problems (such as failure to detach
+        # a disk) if the VM is started and turns out it was actually FV.
+        if self.vm.is_active():
+            self.options.full_virt = self.vm.vm.OSType() == 'hvm'
+        else:
+            self.options.full_virt = False
+            for d in self.vm.get_disk_devices():
+                if d[3].startswith('hd'):
+                    self.options.full_virt = True
+                    break
+
+    def populate_disk_list(self):
+        diskList = self.vm.get_disk_devices()
+        disks = []
+        for d in diskList:
+            disks.append(vmdisks.Disk(d[1], vdev=d[3], vdevType=d[2],
+                                      full_virt=self.options.full_virt, vmname=self.options.vmname, disk_group=disks))
+        max_disks = len(vmdisks.get_possible_vdevs(self.options.full_virt))
+        self.disks_widget.set_max_disks(max_disks)
+        self.disks_widget.set_disks(disks)
+        self.disk_selected()
+
+    def prepare_network_list(self):
+        netsModel = gtk.TreeStore(str,str,str,str)
+        self.nets = nets = gtk.TreeView(netsModel)
+        frame = gtk.Frame()
+        frame.add(nets)
+        frame.set_border_width(10)
+
+        notebook = self.window.get_widget("hw-panel")
+        notebook.remove_page(3)
+        notebook.insert_page(frame, None, 3)
+
+        netType_col = gtk.TreeViewColumn("Type")
+        netType_text = gtk.CellRendererText()
+        netType_col.pack_start(netType_text, True)
+        netType_col.add_attribute(netType_text, 'text', 0)
+
+        netSrc_col = gtk.TreeViewColumn("Source")
+        netSrc_text = gtk.CellRendererText()
+        netSrc_col.pack_start(netSrc_text, True)
+        netSrc_col.add_attribute(netSrc_text, 'text', 1)
+
+        netDevice_col = gtk.TreeViewColumn("Device")
+        netDevice_text = gtk.CellRendererText()
+        netDevice_col.pack_start(netDevice_text, True)
+        netDevice_col.add_attribute(netDevice_text, 'text', 2)
+
+        netDst_col = gtk.TreeViewColumn(_("MAC address"))
+        netDst_text = gtk.CellRendererText()
+        netDst_col.pack_start(netDst_text, True)
+        netDst_col.add_attribute(netDst_text, 'text', 3)
+
+        nets.append_column(netType_col)
+        nets.append_column(netSrc_col)
+        nets.append_column(netDevice_col)
+        nets.append_column(netDst_col)
+
+    def populate_network_list(self):
+        netList = self.vm.get_network_devices()
+
+        netsModel = self.nets.get_model()
+        netsModel.clear()
+        for d in netList:
+            netsModel.append(None, d)
 
     def prepare_hw_list(self):
         hw_list_model = gtk.ListStore(str, str, int, gtk.gdk.Pixbuf, int, gobject.TYPE_PYOBJECT)
@@ -504,94 +693,11 @@ class vmmDetails(gobject.GObject):
         hwCol.add_attribute(hw_img, 'pixbuf', HW_LIST_COL_PIXBUF)
         self.window.get_widget("hw-list").append_column(hwCol)
 
-        self.populate_hw_list()
-
-    def populate_hw_list(self):
-        hw_list_model = self.window.get_widget("hw-list").get_model()
         hw_list_model.clear()
         hw_list_model.append(["Processor", None, 0, self.pixbuf_processor, HW_LIST_TYPE_CPU, []])
         hw_list_model.append(["Memory", None, 0, self.pixbuf_memory, HW_LIST_TYPE_MEMORY, []])
-        self.repopulate_hw_list()
-
-    def repopulate_hw_list(self):
-        hw_list = self.window.get_widget("hw-list")
-        hw_list_model = hw_list.get_model()
-
-        # Populate list of disks
-        currentDisks = {}
-        for disk in self.vm.get_disk_devices():
-            missing = True
-            insertAt = 0
-            currentDisks[disk[3]] = 1
-            for row in hw_list_model:
-                if row[HW_LIST_COL_TYPE] == HW_LIST_TYPE_DISK and row[HW_LIST_COL_DEVICE][3] == disk[3]:
-                    # Update metadata
-                    row[HW_LIST_COL_DEVICE] = disk
-                    missing = False
-                # The insert position must be *before* any NICs
-                if row[HW_LIST_COL_TYPE] != HW_LIST_TYPE_NIC:
-                    insertAt = insertAt + 1
-
-            # Add in row
-            if missing:
-                stock = gtk.STOCK_HARDDISK
-                if disk[2] == "cdrom":
-                    stock = gtk.STOCK_CDROM
-                elif disk[2] == "floppy":
-                    stock = gtk.STOCK_FLOPPY
-                hw_list_model.insert(insertAt, ["Disk %s" % disk[3], stock, gtk.ICON_SIZE_LARGE_TOOLBAR, None, HW_LIST_TYPE_DISK, disk])
-
-        # Populate list of NICs
-        currentNICs = {}
-        nic_number = 0
-        for nic in self.vm.get_network_devices():
-            missing = True
-            insertAt = 0
-            currentNICs[nic[3]] = 1
-            for row in hw_list_model:
-                if row[HW_LIST_COL_TYPE] == HW_LIST_TYPE_NIC and row[HW_LIST_COL_DEVICE][3] == nic[3]:
-                    # Update metadata
-                    row[HW_LIST_COL_DEVICE] = nic
-                    missing = False
-
-                # Insert position is at end....
-                # XXX until we add support for Mice, etc
-                insertAt = insertAt + 1
-
-            # Add in row
-            if missing:
-                hw_list_model.insert(insertAt, ["NIC %s" % nic[3][-9:], gtk.STOCK_NETWORK, gtk.ICON_SIZE_LARGE_TOOLBAR, None, HW_LIST_TYPE_NIC, nic])
-
-        # Now remove any no longer current devs
-        devs = range(len(hw_list_model))
-        devs.reverse()
-        for i in devs:
-            iter = hw_list_model.iter_nth_child(None, i)
-            row = hw_list_model[i]
-            removeIt = False
-
-            if row[HW_LIST_COL_TYPE] == HW_LIST_TYPE_DISK and not currentDisks.has_key(row[HW_LIST_COL_DEVICE][3]):
-                removeIt = True
-            elif row[HW_LIST_COL_TYPE] == HW_LIST_TYPE_NIC and not currentNICs.has_key(row[HW_LIST_COL_DEVICE][3]):
-                removeIt = True
-
-            if removeIt:
-                # Re-select the first row, if we're viewing the device
-                # we're about to remove
-                (selModel, selIter) = hw_list.get_selection().get_selected()
-                selType = selModel.get_value(selIter, HW_LIST_COL_TYPE)
-                selInfo = selModel.get_value(selIter, HW_LIST_COL_DEVICE)
-                if selType == row[HW_LIST_COL_TYPE] and selInfo[3] == row[HW_LIST_COL_DEVICE][3]:
-                    hw_list.get_selection().select_iter(selModel.iter_nth_child(None, 0))
-
-                # Now actually remove it
-                hw_list_model.remove(iter)
-
-
-    def add_hardware(self, src):
-        if self.addhw is None:
-            self.addhw = vmmAddHardware(self.config, self.vm)
-
-        self.addhw.show()
-
+        hw_list_model.append(["Disk", gtk.STOCK_HARDDISK, gtk.ICON_SIZE_LARGE_TOOLBAR, None, HW_LIST_TYPE_DISK, []])
+        hw_list_model.append(["Network", gtk.STOCK_NETWORK, gtk.ICON_SIZE_LARGE_TOOLBAR, None, HW_LIST_TYPE_NIC, []])
 
+        self.prepare_disk_list()
+        self.prepare_network_list()

Places

File virtman-edit.diff of Package virt-manager (Revision c48d5dbb7cd89c98b12ebb122b4ede48)

Places