Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
*) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
esac
;;
*) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
esac
;;
logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
;;
esac
logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
;;
esac
${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} 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}"
;;
if [ "$TYPE" = "vif" ] ; then
local vif_details=$(handle_vswitch_vif_details)
fi
if [ "$TYPE" = "vif" ] ; then
local vif_details=$(handle_vswitch_vif_details)
fi
bridge)
# Nothing to do
;;
bridge)
# Nothing to do
;;
# If ovs-brcompatd is running, it might already have deleted the
# port. Use --if-exists to suppress the error that would otherwise
# arise in that case.
# If ovs-brcompatd is running, it might already have deleted the
# port. Use --if-exists to suppress the error that would otherwise
# arise in that case.
+ bridge|openvswitch) ;;
+ vswitch) NETWORK_MODE=openvswitch ;;
*)
logger -t scripts-vif "Unknown network mode $NETWORK_MODE"
exit 1
*)
logger -t scripts-vif "Unknown network mode $NETWORK_MODE"
exit 1
if network_backend == "bridge":
from InterfaceReconfigureBridge import DatapathBridge
return DatapathBridge(pif)
if network_backend == "bridge":
from InterfaceReconfigureBridge import DatapathBridge
return DatapathBridge(pif)
- elif network_backend == "vswitch":
+ elif network_backend in ["openvswitch", "vswitch"]:
from InterfaceReconfigureVswitch import DatapathVswitch
return DatapathVswitch(pif)
else:
from InterfaceReconfigureVswitch import DatapathVswitch
return DatapathVswitch(pif)
else: