# HG changeset patch
# User john.levon@xxxxxxx
# Date 1169005449 28800
# Node ID c8354aaa46fc366501b3ea5349bd5f5cff31b503
# Parent 9e244ca38dee0407b69dd82e5b05314064664484
Solaris should used a netback of type 'SUNW_mac' and 'vif-vnic' as the
vif-script by default.
Signed-off-by: David Edmondson <dme@xxxxxxx>
diff --git a/tools/python/xen/xend/XendOptions.py
b/tools/python/xen/xend/XendOptions.py
--- a/tools/python/xen/xend/XendOptions.py
+++ b/tools/python/xen/xend/XendOptions.py
@@ -104,6 +104,12 @@ class XendOptions:
"""Default xend management state storage."""
xend_state_path_default = '/var/lib/xend/state'
+ """Default type of backend network interfaces"""
+ netback_type = osdep.netback_type
+
+ """Default script to configure a backend network interface"""
+ vif_script = osdep.vif_script
+
def __init__(self):
self.configure()
@@ -228,7 +234,7 @@ class XendOptions:
return self.get_config_bool('enable-dump', 'no')
def get_vif_script(self):
- return self.get_config_string('vif-script', 'vif-bridge')
+ return self.get_config_string('vif-script', self.vif_script)
def get_dom0_min_mem(self):
return self.get_config_int('dom0-min-mem', self.dom0_min_mem_default)
diff --git a/tools/python/xen/xend/osdep.py b/tools/python/xen/xend/osdep.py
--- a/tools/python/xen/xend/osdep.py
+++ b/tools/python/xen/xend/osdep.py
@@ -33,9 +33,19 @@ _pygrub_path = {
"SunOS": "/usr/lib/xen/bin/pygrub"
}
+_netback_type = {
+ "SunOS": "SUNW_mac"
+}
+
+_vif_script = {
+ "SunOS": "vif-vnic"
+}
+
def _get(var, default=None):
return var.get(os.uname()[0], default)
scripts_dir = _get(_scripts_dir, "/etc/xen/scripts")
xend_autorestart = _get(_xend_autorestart)
pygrub_path = _get(_pygrub_path, "/usr/bin/pygrub")
+netback_type = _get(_netback_type, "netfront")
+vif_script = _get(_vif_script, "vif-bridge")
diff --git a/tools/python/xen/xend/server/netif.py
b/tools/python/xen/xend/server/netif.py
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -150,9 +150,8 @@ class NetifController(DevController):
devid = self.allocateDeviceID()
- # The default type is 'netfront'.
if not typ:
- typ = 'netfront'
+ typ = xoptions.netback_type
if not mac:
mac = randomMAC()
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home