IP="/sbin/ip"
vsctl="/usr/bin/ovs-vsctl"
-dump_vif_details="/usr/share/vswitch/scripts/dump-vif-details"
handle_promiscuous()
{
local arg=$(xenstore-read "${PRIVATE}/other-config/promiscuous" 2>/dev/null)
if [ $? -eq 0 -a -n "${arg}" ] ; then
- case $NETWORK_MODE in
- bridge)
- case "${arg}" in
- true|on) echo 1 > /sys/class/net/${dev}/brport/promisc ;;
- *) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
- esac
- ;;
- vswitch)
- logger -t script-vif "${dev}: Promiscuous ports are not supported via vSwitch."
- ;;
- esac
+ case $NETWORK_MODE in
+ bridge)
+ case "${arg}" in
+ true|on) echo 1 > /sys/class/net/${dev}/brport/promisc ;;
+ *) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
+ esac
+ ;;
+ openvswitch)
+ logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
+ ;;
+ esac
fi
}
{
local mtu=$(xenstore-read "${PRIVATE}/MTU" 2>/dev/null)
if [ $? -eq 0 -a -n "${mtu}" ]; then
- echo "${mtu}" > /sys/class/net/${dev}/mtu
+ logger -t scripts-vif "Setting ${dev} MTU ${mtu}"
+ ${IP} link set "${dev}" mtu ${mtu} || logger -t scripts-vif "Failed to ip link set ${dev} mtu ${mtu}. Error code $?"
+ fi
+}
+
+set_vif_external_id()
+{
+ local key=$1
+ local value=$2
+
+ logger -t scripts-vif "vif${DOMID}.${DEVID} external-ids:\"${key}\"=\"${value}\""
+
+ echo "-- set interface vif${DOMID}.${DEVID} external-ids:\"${key}\"=\"${value}\""
+}
+
+handle_vswitch_vif_details()
+{
+ local vm=$(xenstore-read "/local/domain/$DOMID/vm" 2>/dev/null)
+ if [ $? -eq 0 -a -n "${vm}" ] ; then
+ local vm_uuid=$(xenstore-read "$vm/uuid" 2>/dev/null)
+ fi
+ if [ -n "${vm_uuid}" ] ; then
+ set_vif_external_id "xs-vm-uuid" "${vm_uuid}"
+ fi
+
+ local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null)
+ if [ -n "${vif_uuid}" ] ; then
+ set_vif_external_id "xs-vif-uuid" "${vif_uuid}"
+ fi
+
+ local vif_details=
+ local net_uuid=$(xenstore-read "${PRIVATE}/network-uuid" 2>/dev/null)
+ if [ -n "${net_uuid}" ] ; then
+ set_vif_external_id "xs-network-uuid" "${net_uuid}"
+ fi
+ local address=$(xenstore-read "/local/domain/$DOMID/device/vif/$DEVID/mac" 2>/dev/null)
+ if [ -n "${address}" ] ; then
+ set_vif_external_id "attached-mac" "${address}"
fi
}
{
local address=$(xenstore-read "${PRIVATE}/bridge-MAC")
if [ $? -ne 0 -o -z "${address}" ]; then
- logger -t scripts-vif "Failed to read ${PRIVATE}/bridge-MAC from xenstore"
- exit 1
+ logger -t scripts-vif "Failed to read ${PRIVATE}/bridge-MAC from xenstore"
+ exit 1
fi
local bridge=$(xenstore-read "${PRIVATE}/bridge")
if [ $? -ne 0 -o -z "${bridge}" ]; then
- logger -t scripts-vif "Failed to read ${PRIVATE}/bridge from xenstore"
- exit 1
+ logger -t scripts-vif "Failed to read ${PRIVATE}/bridge from xenstore"
+ exit 1
fi
logger -t scripts-vif "Adding ${dev} to ${bridge} with address ${address}"
${IP} addr flush "${dev}" || logger -t scripts-vif "Failed to ip addr flush ${dev}"
case $NETWORK_MODE in
- bridge)
- ${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}"
- ;;
- vswitch)
- local vif_details=$($dump_vif_details $DOMID $DEVID)
- if [ $? -ne 0 -o -z "${vif_details}" ]; then
- logger -t scripts-vif "Failed to retrieve vif details for vswitch"
- fi
-
- $vsctl add-port $bridge $dev $vif_details
- ;;
+ bridge)
+ ${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}"
+ ;;
+ openvswitch)
+ if [ "$TYPE" = "vif" ] ; then
+ local vif_details=$(handle_vswitch_vif_details $bridge)
+ fi
+
+ $vsctl --timeout=30 -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details
+ ;;
esac
-
+
${IP} link set "${dev}" up || logger -t scripts-vif "Failed to ip link set ${dev} up"
}
remove_from_bridge()
{
case $NETWORK_MODE in
- bridge)
- # Nothing to do
- ;;
- vswitch)
- $vsctl del-port $bridge $dev
- ;;
+ bridge)
+ # Nothing to do
+ ;;
+ openvswitch)
+ $vsctl --timeout=30 -- del-port $dev
+ ;;
esac
}
+call_hook_script() {
+ local domid=$1
+ local action=$2
+ # Call the VIF hotplug hook if present
+ if [ -x /etc/xapi.d/vif-hotplug ]; then
+ local vm=$(xenstore-read "/local/domain/$domid/vm" 2>/dev/null)
+ if [ $? -eq 0 -a -n "${vm}" ] ; then
+ local vm_uuid=$(xenstore-read "$vm/uuid" 2>/dev/null)
+ fi
+ if [ -n "${vm_uuid}" ] ; then
+ logger -t scripts-vif "VM UUID ${vm_uuid}"
+ fi
+
+ local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null)
+ if [ -n "${vif_uuid}" ] ; then
+ logger -t scripts-vif "VIF UUID ${vif_uuid}"
+ fi
+ if [ -n "${vif_uuid}" -a -n "${vm_uuid}" ] ; then
+ logger -t scripts-vif "Calling VIF hotplug hook for VM ${vm_uuid}, VIF ${vif_uuid}"
+ /etc/xapi.d/vif-hotplug -action "${action}" -vifuuid "${vif_uuid}" -vmuuid "${vm_uuid}"
+ fi
+ fi
+}
+
NETWORK_MODE=$(cat /etc/xensource/network.conf)
ACTION=$1
fi
case $NETWORK_MODE in
- bridge|vswitch) ;;
+ 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
+ ;;
esac
case ${TYPE} in
vif)
- DOMID=`echo ${XENBUS_PATH} | cut -f 3 -d '/'`
- DEVID=`echo ${XENBUS_PATH} | cut -f 4 -d '/'`
- dev=vif${DOMID}.${DEVID}
- ;;
+ if [ -z ${XENBUS_PATH} ]; then
+ DOMID=$3
+ DEVID=$4
+ else
+ DOMID=`echo ${XENBUS_PATH} | cut -f 3 -d '/'`
+ DEVID=`echo ${XENBUS_PATH} | cut -f 4 -d '/'`
+ fi
+ dev=vif${DOMID}.${DEVID}
+ ;;
tap)
- dev=$INTERFACE
- DOMID=`echo ${dev#tap} | cut -f 1 -d '.'`
- DEVID=`echo ${dev#tap} | cut -f 2 -d '.'`
- ;;
+ dev=$INTERFACE
+ DOMID=`echo ${dev#tap} | cut -f 1 -d '.'`
+ DEVID=`echo ${dev#tap} | cut -f 2 -d '.'`
+ ;;
*)
- logger -t scripts-vif "unknown interface type ${TYPE}"
- exit 1
- ;;
+ logger -t scripts-vif "unknown interface type ${TYPE}"
+ exit 1
+ ;;
esac
XAPI=/xapi/${DOMID}/hotplug/vif/${DEVID}
logger -t scripts-vif "Called as \"$@\" domid:$DOMID devid:$DEVID mode:$NETWORK_MODE"
case "${ACTION}" in
online)
- if [ "${TYPE}" = "vif" ] ; then
- handle_ethtool rx
- handle_ethtool tx
- handle_ethtool sg
- handle_ethtool tso
- handle_ethtool ufo
- handle_ethtool gso
-
- handle_mtu
- add_to_bridge
- handle_promiscuous
-
- xenstore-write "${HOTPLUG}/vif" "${dev}"
- xenstore-write "${HOTPLUG}/hotplug" "online"
-
- # xs-xen.pq.hq:91e986b8e49f netback-wait-for-hotplug
- xenstore-write "/local/domain/0/backend/vif/${DOMID}/${DEVID}/hotplug-status" "connected"
- fi
- ;;
+ if [ "${TYPE}" = "vif" ] ; then
+ handle_ethtool rx
+ handle_ethtool tx
+ handle_ethtool sg
+ handle_ethtool tso
+ handle_ethtool ufo
+ handle_ethtool gso
+
+ handle_mtu
+ add_to_bridge
+ handle_promiscuous
+
+ xenstore-write "${HOTPLUG}/vif" "${dev}"
+ xenstore-write "${HOTPLUG}/hotplug" "online"
+
+ # xs-xen.pq.hq:91e986b8e49f netback-wait-for-hotplug
+ xenstore-write "/local/domain/0/backend/vif/${DOMID}/${DEVID}/hotplug-status" "connected"
+ call_hook_script $DOMID "${ACTION}"
+ fi
+ ;;
add)
- if [ "${TYPE}" = "tap" ] ; then
- add_to_bridge
- fi
- ;;
+ if [ "${TYPE}" = "tap" ] ; then
+ add_to_bridge
+ fi
+ ;;
remove)
- if [ "${TYPE}" = "vif" ] ;then
- xenstore-rm "${HOTPLUG}/hotplug"
- fi
- logger -t scripts-vif "${dev} has been removed"
- remove_from_bridge
- ;;
+ if [ "${TYPE}" = "vif" ] ;then
+ xenstore-rm "${HOTPLUG}/hotplug"
+ call_hook_script $DOMID "${ACTION}"
+ fi
+ logger -t scripts-vif "${dev} has been removed"
+ remove_from_bridge
+ ;;
+
+move)
+ if [ "${TYPE}" = "vif" ] ;then
+ add_to_bridge
+ fi
esac
git://git.onelab.eu / sliver-openvswitch.git / blobdiff