shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-12 09:18:00 +03:00
Code Issues Projects Releases Wiki Activity

virt-manager: enable direct interface selection

Browse Source 
The following patch adds support to select direct interfaces
when defining a virtual machine via virt-manager. Also remove
the unused show_manual_bridge.

Signed-off-by: Gerhard Stenzel <gerhard.stenzel@de.ibm.com>
This commit is contained in:
Gerhard Stenzel 2011-04-06 16:07:12 +02:00 committed by Cole Robinson
parent 86f4bdaf1d
commit 89dbf1e7cf
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/virtManager/create.py
View File

@ -548,7 +548,7 @@ class vmmCreate(vmmGObjectUI):
# Networking
net_list = self.window.get_widget("config-netdev")
do_warn = uihelpers.populate_network_list(net_list, self.conn)
do_warn = uihelpers.populate_network_list(net_list, self.conn, False)
self.set_net_warn(self.conn.netdev_error or do_warn,
self.conn.netdev_error, True)

24
src/virtManager/uihelpers.py
View File

@ -354,7 +354,7 @@ def get_network_selection(net_list, bridge_entry):
return net_type, net_src
def populate_network_list(net_list, conn, show_manual_bridge=True):
def populate_network_list(net_list, conn, show_direct_interfaces=True):
model = net_list.get_model()
model.clear()
@ -438,8 +438,15 @@ def populate_network_list(net_list, conn, show_manual_bridge=True):
bridge_name = name
brlabel = _("(Empty bridge)")
else:
sensitive = False
brlabel = "(%s)" % _("Not bridged")
if (show_direct_interfaces and virtinst.support.check_conn_support(conn.vmm,
virtinst.support.SUPPORT_CONN_HV_DIRECT_INTERFACE)):
sensitive = True
nettype = VirtualNetworkInterface.TYPE_DIRECT
bridge_name = name
brlabel = ": %s" % _("macvtap")
else:
sensitive = False
brlabel = "(%s)" % _("Not bridged")
label = _("Host device %s %s") % (br.get_name(), brlabel)
if hasShared and not brIdxLabel:
@ -482,11 +489,10 @@ def populate_network_list(net_list, conn, show_manual_bridge=True):
model.insert(0, row)
default = 0
if show_manual_bridge:
# After all is said and done, add a manual bridge option
manual_row = build_row(None, None, _("Specify shared device name"),
True, False, manual_bridge=True)
model.append(manual_row)
# After all is said and done, add a manual bridge option
manual_row = build_row(None, None, _("Specify shared device name"),
True, False, manual_bridge=True)
model.append(manual_row)
set_active(default)
return return_warn
@ -527,6 +533,8 @@ def validate_network(parent, conn, nettype, devname, macaddr, model=None):
netname = devname
elif nettype == VirtualNetworkInterface.TYPE_BRIDGE:
bridge = devname
elif nettype == VirtualNetworkInterface.TYPE_DIRECT:
bridge = devname
elif nettype == VirtualNetworkInterface.TYPE_USER:
pass