mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-21 14:49:41 +00:00
Code Issues Releases Wiki Activity

interface-reconfigure+vif: accept openvswitch in /etc/xensource/network.conf

Browse Source 
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Ian Campbell
2010-04-08 15:00:21 +01:00
committed by Ben Pfaff
parent 7128cd6b04
commit aeb2b7a166
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xenserver/etc_xensource_scripts_vif
View File

@@ -46,7 +46,7 @@ handle_promiscuous()
*) echo 0 > /sys/class/net/${dev}/brport/promisc ;; *) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
esac esac
;; ;;
vswitch) openvswitch)
logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch." logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
;; ;;
esac esac
@@ -164,7 +164,7 @@ add_to_bridge()
${BRCTL} setfd "${bridge}" 0 || logger -t scripts-vif "Failed to brctl setfd ${bridge} 0" ${BRCTL} setfd "${bridge}" 0 || logger -t scripts-vif "Failed to brctl setfd ${bridge} 0"
${BRCTL} addif "${bridge}" "${dev}" || logger -t scripts-vif "Failed to brctl addif ${bridge} ${dev}" ${BRCTL} addif "${bridge}" "${dev}" || logger -t scripts-vif "Failed to brctl addif ${bridge} ${dev}"
;; ;;
vswitch) openvswitch)
if [ "$TYPE" = "vif" ] ; then if [ "$TYPE" = "vif" ] ; then
local vif_details=$(handle_vswitch_vif_details) local vif_details=$(handle_vswitch_vif_details)
fi fi
@@ -182,7 +182,7 @@ remove_from_bridge()
bridge) bridge)
# Nothing to do # Nothing to do
;; ;;
vswitch) openvswitch)
# If ovs-brcompatd is running, it might already have deleted the # If ovs-brcompatd is running, it might already have deleted the
# port. Use --if-exists to suppress the error that would otherwise # port. Use --if-exists to suppress the error that would otherwise
# arise in that case. # arise in that case.
@@ -202,7 +202,8 @@ else
fi fi
case $NETWORK_MODE in case $NETWORK_MODE in
bridge|vswitch) ;; bridge|openvswitch) ;;
vswitch) NETWORK_MODE=openvswitch ;;
*) *)
logger -t scripts-vif "Unknown network mode $NETWORK_MODE" logger -t scripts-vif "Unknown network mode $NETWORK_MODE"
exit 1 exit 1

2
xenserver/opt_xensource_libexec_InterfaceReconfigure.py
View File

@@ -863,7 +863,7 @@ def DatapathFactory(pif):
if network_backend == "bridge": if network_backend == "bridge":
from InterfaceReconfigureBridge import DatapathBridge from InterfaceReconfigureBridge import DatapathBridge
return DatapathBridge(pif) return DatapathBridge(pif)
elif network_backend == "vswitch": elif network_backend in ["openvswitch", "vswitch"]:
from InterfaceReconfigureVswitch import DatapathVswitch from InterfaceReconfigureVswitch import DatapathVswitch
return DatapathVswitch(pif) return DatapathVswitch(pif)
else: else: