vsctl="/usr/bin/ovs-vsctl"
+# XAPI before build 29381 (approximately) did not provide some of the
+# data in XenStore that we rely on.
+. /etc/xensource-inventory
+if test "$PRODUCT_VERSION" = "5.5.0" || test "${BUILD_NUMBER%[a-z]}" -le 26131
+then
+ xs550=true
+else
+ xs550=false
+fi
+
handle_promiscuous()
{
local arg=$(xenstore-read "${PRIVATE}/other-config/promiscuous" 2>/dev/null)
*) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
esac
;;
- vswitch)
- logger -t script-vif "${dev}: Promiscuous ports are not supported via vSwitch."
+ openvswitch)
+ logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
;;
esac
fi
handle_vswitch_vif_details()
{
- 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}"
+ 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
-
- local address=$(xenstore-read "/local/domain/$DOMID/device/vif/$DEVID/mac" 2>/dev/null)
- if [ -n "${address}" ] ; then
- set_vif_external_id "xs-vif-mac" "${address}"
+ if [ -n "${vm_uuid}" ] ; then
+ set_vif_external_id "vm-uuid" "${vm_uuid}"
fi
local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null)
+ if $xs550 && [ -z "${vif_uuid}" ] && [ -n "${vm_uuid}" ]; then
+ vif_uuid=$(xe vif-list --minimal vm-uuid="${vm_uuid}" device=$DEVID)
+ fi
if [ -n "${vif_uuid}" ] ; then
- set_vif_external_id "xs-vif-uuid" "${vif_uuid}"
+ set_vif_external_id "vif-uuid" "${vif_uuid}"
fi
- 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)
+ local vif_details=
+ local net_uuid=$(xenstore-read "${PRIVATE}/network-uuid" 2>/dev/null)
+ if $xs550 && [ -z "${net_uuid}" ] && [ -n "${vif_uuid}" ]; then
+ net_uuid=$(xe vif-param-get uuid="${vif_uuid}" param-name=network-uuid)
fi
- if [ -n "${vm_uuid}" ] ; then
- set_vif_external_id "xs-vm-uuid" "${vm_uuid}"
+ if [ -n "${net_uuid}" ] ; then
+ set_vif_external_id "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 "vif-mac" "${address}"
fi
}
xs550_set_internal_network_uuid()
{
- . /etc/xensource-inventory
- if test "$PRODUCT_VERSION" = "5.5.0" || test "${BUILD_NUMBER%p}" -le 26131
- then
+ if $xs550; then
# vNetManager needs to know the network UUID(s) associated with each
# datapath. Normally interface-reconfigure adds them, but XAPI does
# not use interface-reconfigure for internal networks. Instead, XAPI
local bridge=$1
local net_uuid=$(xenstore-read "${PRIVATE}/network-uuid" 2>/dev/null)
if [ -n "${net_uuid}" ] ; then
- logger -t scripts-vif "${bridge} xs-network-uuids ${net_uuid}"
- echo "-- br-set-external-id \"$bridge\" xs-network-uuids \"${net_uuid}\""
+ logger -t scripts-vif "${bridge} network-uuids ${net_uuid}"
+ echo "-- br-set-external-id $bridge network-uuids ${net_uuid}"
fi
- else
- # XAPI after 5.5.0 sets the network external ids itself, via ovs-vsctl.
- :
fi
}
${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)
+ openvswitch)
if [ "$TYPE" = "vif" ] ; then
local vif_details=$(handle_vswitch_vif_details)
fi
- $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details $(xs550_set_internal_network_uuid)
+ $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details $(xs550_set_internal_network_uuid $bridge)
;;
esac
bridge)
# Nothing to do
;;
- vswitch)
- $vsctl del-port $bridge $dev
+ openvswitch)
+ # 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.
+ $vsctl -- --if-exists del-port $dev
;;
esac
}
fi
case $NETWORK_MODE in
- bridge|vswitch) ;;
+ bridge|openvswitch) ;;
+ vswitch) NETWORK_MODE=openvswitch ;;
*)
logger -t scripts-vif "Unknown network mode $NETWORK_MODE"
exit 1