openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

host: Clean up network selected function. 

Make a new network function 'pretty_forward_mode' so we aren't duplicating
functionality everywhere.
This commit is contained in:
Cole Robinson 2009-11-16 07:14:49 -05:00
parent d2cd4e06c5
commit 5b93ae15b6
4 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/virtManager/clone.py
View File

@ -252,13 +252,7 @@ class vmmCloneVM(gobject.GObject):
if net:
label = ""
use_nat, host_dev = net.get_ipv4_forward()
if not use_nat:
desc = _("Isolated network")
elif host_dev:
desc = _("NAT to %s") % host_dev
else:
desc = _("NAT")
desc = net.pretty_forward_mode()
label += "%s" % desc
else:

8
src/virtManager/create.py
View File

@ -639,13 +639,7 @@ class vmmCreate(gobject.GObject):
if not net.is_active():
label += " (%s)" % _("Inactive")
use_nat, host_dev = net.get_ipv4_forward()
if not use_nat:
desc = _("Isolated network")
elif host_dev:
desc = _("NAT to %s") % host_dev
else:
desc = _("NAT to any device")
desc = net.pretty_forward_mode()
label += ": %s" % desc
model.append([ VirtualNetworkInterface.TYPE_VIRTUAL,

54
src/virtManager/host.py
View File

@ -324,49 +324,43 @@ class vmmHost(gobject.GObject):
self.window.get_widget("net-details").set_sensitive(True)
self.window.get_widget("net-name").set_text(net.get_name())
if active:
self.window.get_widget("net-device").set_text(net.get_bridge_device())
self.window.get_widget("net-device").set_sensitive(True)
self.window.get_widget("net-state").set_text(_("Active"))
self.window.get_widget("net-state-icon").set_from_pixbuf(self.PIXBUF_STATE_RUNNING)
else:
self.window.get_widget("net-device").set_text("")
self.window.get_widget("net-device").set_sensitive(False)
self.window.get_widget("net-state").set_text(_("Inactive"))
self.window.get_widget("net-state-icon").set_from_pixbuf(self.PIXBUF_STATE_SHUTOFF)
dev = active and net.get_bridge_device() or ""
state = active and _("Active") or _("Inactive")
icon = (active and self.PIXBUF_STATE_RUNNING or
self.PIXBUF_STATE_SHUTOFF)
self.window.get_widget("net-device").set_text(dev)
self.window.get_widget("net-device").set_sensitive(active)
self.window.get_widget("net-state").set_text(state)
self.window.get_widget("net-state-icon").set_from_pixbuf(icon)
self.window.get_widget("net-start").set_sensitive(not active)
self.window.get_widget("net-stop").set_sensitive(active)
self.window.get_widget("net-delete").set_sensitive(not active)
autostart = net.get_autostart()
autolabel = autostart and _("On Boot") or _("Never")
self.window.get_widget("net-autostart").set_active(autostart)
if autostart:
self.window.get_widget("net-autostart").set_label(_("On Boot"))
else:
self.window.get_widget("net-autostart").set_label(_("Never"))
self.window.get_widget("net-autostart").set_label(autolabel)
network = net.get_ipv4_network()
self.window.get_widget("net-ip4-network").set_text(str(network))
dhcp = net.get_ipv4_dhcp_range()
if dhcp is not None:
self.window.get_widget("net-ip4-dhcp-start").set_text(str(dhcp[0]))
self.window.get_widget("net-ip4-dhcp-end").set_text(str(dhcp[1]))
else:
self.window.get_widget("net-ip4-dhcp-start").set_text("Disabled")
self.window.get_widget("net-ip4-dhcp-end").set_text("Disabled")
start = dhcp and str(dhcp[0]) or _("Disabled")
end = dhcp and str(dhcp[1]) or _("Disabled")
self.window.get_widget("net-ip4-dhcp-start").set_text(start)
self.window.get_widget("net-ip4-dhcp-end").set_text(end)
(forward, forwardDev) = net.get_ipv4_forward()
if forward:
self.window.get_widget("net-ip4-forwarding-icon").set_from_stock(gtk.STOCK_CONNECT, gtk.ICON_SIZE_MENU)
if forwardDev != None and forwardDev != "":
self.window.get_widget("net-ip4-forwarding").set_text(_("NAT to physical device %s") % (forwardDev))
else:
self.window.get_widget("net-ip4-forwarding").set_text(_("NAT to any physical device"))
else:
self.window.get_widget("net-ip4-forwarding-icon").set_from_stock(gtk.STOCK_DISCONNECT, gtk.ICON_SIZE_MENU)
self.window.get_widget("net-ip4-forwarding").set_text(_("Isolated virtual network"))
forward, ignore = net.get_ipv4_forward()
iconsize = gtk.ICON_SIZE_MENU
icon = forward and gtk.STOCK_CONNECT or gtk.STOCK_DISCONNECT
self.window.get_widget("net-ip4-forwarding-icon").set_from_stock(
icon, iconsize)
forward_str = net.pretty_forward_mode()
self.window.get_widget("net-ip4-forwarding").set_text(forward_str)
self.window.get_widget("net-apply").set_sensitive(False)

31
src/virtManager/network.py
View File

@ -65,7 +65,10 @@ class vmmNetwork(gobject.GObject):
return self.uuid
def get_bridge_device(self):
try:
return self.net.bridgeName()
except:
return ""
def start(self):
self.net.create()
@ -97,13 +100,9 @@ class vmmNetwork(gobject.GObject):
def get_ipv4_forward(self):
xml = self.get_xml()
fw = util.get_xml_path(xml, "string(count(/network/forward))")
if fw != None and int(fw) != 0:
forwardDev = util.get_xml_path(xml, "string(/network/forward/@dev)")
return [True, forwardDev]
else:
return [False, None]
fw = util.get_xml_path(xml, "/network/forward/@mode")
forwardDev = util.get_xml_path(xml, "/network/forward/@dev")
return [fw, forwardDev]
def get_ipv4_dhcp_range(self):
xml = self.get_xml()
@ -114,6 +113,24 @@ class vmmNetwork(gobject.GObject):
return [IP(dhcpstart), IP(dhcpend)]
def pretty_forward_mode(self):
forward, forwardDev = self.get_ipv4_forward()
if forward or forwardDev:
if not forward or forward == "nat":
if forwardDev:
desc = _("NAT to %s") % forwardDev
else:
desc = _("NAT")
elif forward == "route":
if forwardDev:
desc = _("Route to %s") % forwardDev
else:
desc = _("Routed network")
else:
desc = _("Isolated network")
return desc
def is_read_only(self):
if self.connection.is_read_only():
return True