Mercurial Mercurial > upstream > oracle > spec-files / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/virt-manager-07-virtual-network.diff
author mattman
Thu, 18 Jun 2009 14:13:32 +0000
changeset 15942 40ffef79e81f
permissions -rw-r--r--
* SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118 coinciding with integration of libvirt 0.6.0 by Xen team. * base-specs/virt-manager.spec : Bump to 0.6.1 * manpages/man1/virt-manager.1 : Reworked. * patches/virt-manager-01-build-flags.diff : Re-Work * patches/virt-manager-02-serial-console.diff : Re-Work * patches/virt-manager-03-root-user.diff : New Patch * patches/virt-manager-04-min-storage-size.diff : New Patch * patches/virt-manager-05-open-connection.diff : New Patch * patches/virt-manager-06-connection-startup.diff : New Patch * patches/virt-manager-07-virtual-network.diff : New Patch * patches/virt-manager-08-dladm-network.diff : New Patch * patches/virt-manager-09-create-arch.diff : New Patch * patches/virt-manager-10-options-exit.diff : New Patch * patches/virt-manager-11-disable-remove-hardware.diff : New Patch * patches/virt-manager-12-storage-browse.diff : New Patch * patches/virt-manager-03-g11n-desktop.diff : Remove Old Patch * patches/virt-manager-04-temporary-patch.diff : Remove Old Patch * patches/virt-manager-05-host-about.diff : Remove Old Patch * patches/virt-manager-06-delete-button.diff : Remove Old Patch * patches/virt-manager-07-build.diff : Remove Old Patch * patches/virt-manager-08-filesize.diff : Remove Old Patch * patches/virt-manager-09-gtk-spin-button.diff : Remove Old Patch * patches/virt-manager-10-cdrom-disks.diff : Remove Old Patch

/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/host.py virt-manager-0.6.1/src/virtManager/host.py
--- virt-manager-0.6.1.old/src/virtManager/host.py	2009-01-26 19:33:33.000000000 +0000
+++ virt-manager-0.6.1/src/virtManager/host.py	2009-04-03 12:34:32.590142391 +0100
@@ -61,6 +61,8 @@ class vmmHost(gobject.GObject):
         self.window.get_widget("overview-cpus").set_text(str(self.conn.host_active_processor_count()))
         self.window.get_widget("overview-arch").set_text(self.conn.host_architecture())
         self.window.get_widget("config-autoconnect").set_active(conn.get_autoconnect())
+        # No virtual network support, deactivate add-net
+        self.window.get_widget("net-add").set_sensitive(False)
 
         netListModel = gtk.ListStore(str, str, str)
         self.window.get_widget("net-list").set_model(netListModel)
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/addhardware.py virt-manager-0.6.1/src/virtManager/addhardware.py
--- virt-manager-0.6.1.old/src/virtManager/addhardware.py	2009-04-17 12:51:27.988403597 +0100
+++ virt-manager-0.6.1/src/virtManager/addhardware.py	2009-04-17 12:59:34.580561537 +0100
@@ -120,6 +120,14 @@ class vmmAddHardware(gobject.GObject):
         network_list.pack_start(text, True)
         network_list.add_attribute(text, 'text', 1)
 
+        # We don't support virtual networks, hide them
+        self.window.get_widget("net-type-network").set_active(False)
+        self.window.get_widget("net-type-network").set_sensitive(False)
+        self.window.get_widget("net-type-device").set_active(True)
+        self.window.get_widget("net-type-device").set_sensitive(True)
+        self.window.get_widget("net-network").set_active(False)
+        self.window.get_widget("net-network").set_sensitive(False)
+
         device_list = self.window.get_widget("net-device")
         device_model = gtk.ListStore(str, str, bool)
         device_list.set_model(device_model)
@@ -191,8 +199,13 @@ class vmmAddHardware(gobject.GObject):
         self.window.get_widget("non-sparse").set_active(True)
         self.window.get_widget("hardware-type").set_active(0)
 
-        self.window.get_widget("net-type-network").set_active(True)
-        self.window.get_widget("net-type-device").set_active(False)
+        # We don't support virtual networks, hide them
+        self.window.get_widget("net-type-network").set_active(False)
+        self.window.get_widget("net-type-network").set_sensitive(False)
+        self.window.get_widget("net-type-device").set_active(True)
+        self.window.get_widget("net-network").set_active(False)
+        self.window.get_widget("net-network").set_sensitive(False)
+
         self.window.get_widget("mac-address").set_active(False)
         self.window.get_widget("create-mac-address").set_text("")
 
@@ -370,11 +383,11 @@ class vmmAddHardware(gobject.GObject):
         if self.window.get_widget("net-type-network").get_active():
             net = self.window.get_widget("net-network")
             model = net.get_model()
-            return ["network", model.get_value(net.get_active_iter(), 0)]
+            return ["network", model.get_value(net.get_active_iter(), 1)]
         else:
             dev = self.window.get_widget("net-device")
             model = dev.get_model()
-            return ["bridge", model.get_value(dev.get_active_iter(), 0)]
+            return ["bridge", model.get_value(dev.get_active_iter(), 1)]
 
     def get_config_net_model(self):
         model = self.window.get_widget("net-model")
@@ -412,10 +425,10 @@ class vmmAddHardware(gobject.GObject):
                 netmodel.set_active(0)
 
             if remote:
-                self.window.get_widget("net-type-network").set_active(True)
-                self.window.get_widget("net-type-device").set_active(False)
-                self.window.get_widget("net-type-device").set_sensitive(False)
-                self.window.get_widget("net-device").set_active(-1)
+                self.window.get_widget("net-type-network").set_active(False)
+                self.window.get_widget("net-type-network").set_sensitive(False)
+                self.window.get_widget("net-type-device").set_active(True)
+                self.window.get_widget("net-type-device").set_sensitive(True)
             else:
                 self.window.get_widget("net-type-device").set_sensitive(True)
             self.change_network_type()
@@ -898,7 +911,11 @@ class vmmAddHardware(gobject.GObject):
                 hasShared = True
                 if brIndex < 0:
                     brIndex = len(model)
-                model.append([net.get_bridge(), "%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
+
+                if net.get_bridge() is not None:
+                    model.append([net.get_bridge(), "%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
+                else:
+                    model.append([net.get_bridge(), "%s" % net.get_name(), True])
             else:
                 model.append([net.get_bridge(), "%s (%s)" % (net.get_name(), _("Not bridged")), False])
         return (hasShared, brIndex)
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/create.py virt-manager-0.6.1/src/virtManager/create.py
--- virt-manager-0.6.1.old/src/virtManager/create.py	2009-04-17 13:02:49.677378493 +0100
+++ virt-manager-0.6.1/src/virtManager/create.py	2009-04-17 13:03:06.741706914 +0100
@@ -170,6 +170,13 @@ class vmmCreate(gobject.GObject):
         network_list.pack_start(text, True)
         network_list.add_attribute(text, 'text', 1)
 
+        # Virtual network not supported, de-activate
+        self.window.get_widget("net-type-network").set_active(False)
+        self.window.get_widget("net-type-network").set_sensitive(False)
+        self.window.get_widget("net-type-device").set_active(True)
+        self.window.get_widget("net-network").set_active(False)
+        self.window.get_widget("net-network").set_sensitive(False)
+
         device_list = self.window.get_widget("net-device")
         device_model = gtk.ListStore(str, str, bool)
         device_list.set_model(device_model)
@@ -280,8 +287,8 @@ class vmmCreate(gobject.GObject):
         self.populate_os_type_model()
         self.window.get_widget("os-type").set_active(0)
 
-        self.window.get_widget("net-type-network").set_active(True)
-        self.window.get_widget("net-type-device").set_active(False)
+        self.window.get_widget("net-type-network").set_active(False)
+        self.window.get_widget("net-type-device").set_active(True)
         self.window.get_widget("mac-address").set_active(False)
         self.window.get_widget("create-mac-address").set_text("")
 
@@ -430,11 +437,13 @@ class vmmCreate(gobject.GObject):
         if self.window.get_widget("net-type-network").get_active():
             net = self.window.get_widget("net-network")
             model = net.get_model()
-            return ["network", model.get_value(net.get_active_iter(), 0)]
+            # Solaris: Check index 1 not 0
+            return ["network", model.get_value(net.get_active_iter(), 1)]
         else:
             dev = self.window.get_widget("net-device")
             model = dev.get_model()
-            return ["bridge", model.get_value(dev.get_active_iter(), 0)]
+            # Solaris: Check index 1 not 0
+            return ["bridge", model.get_value(dev.get_active_iter(), 1)]
 
     def get_config_macaddr(self):
         macaddr = None
@@ -1151,7 +1160,12 @@ class vmmCreate(gobject.GObject):
                 hasShared = True
                 if brIndex < 0:
                     brIndex = len(model)
-                model.append([net.get_bridge(), "%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
+
+                # Solaris: if bridge does nto exist don't include in nic name
+                if net.get_bridge() is not None:
+                    model.append([net.get_bridge(), "%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
+                else:
+                    model.append([net.get_bridge(), "%s" % net.get_name(), True])
             else:
                 model.append([net.get_bridge(), "%s (%s)" % (net.get_name(), _("Not bridged")), False])
         return (hasShared, brIndex)
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/vmm-host.glade virt-manager-0.6.1/src/vmm-host.glade
--- virt-manager-0.6.1.old/src/vmm-host.glade	2009-04-22 09:22:46.778240542 +0100
+++ virt-manager-0.6.1/src/vmm-host.glade	2009-04-22 09:23:04.474365318 +0100
@@ -411,7 +411,7 @@
             </child>
             <child>
               <widget class="GtkVBox" id="vbox7">
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="border_width">3</property>
                 <child>
                   <widget class="GtkHPaned" id="hpaned2">
@@ -944,7 +944,7 @@
             </child>
             <child>
               <widget class="GtkVBox" id="vbox5">
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="border_width">3</property>
                 <child>
                   <widget class="GtkHPaned" id="hpaned1">
upstream/oracle/spec-files