X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fetc_xensource_scripts_vif;h=88006e2c4901104c5874e21d435590e062b33f25;hb=refs%2Fheads%2Flts-1.0a;hp=3a209f9b4ae315d732483d0d6fb8f9f4eb1323d5;hpb=d5bac2a0cfea7efc27c4f06de132460390a2e920;p=sliver-openvswitch.git

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 3a209f9b4..88006e2c4 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -25,21 +25,31 @@ IP="/sbin/ip"
 
 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)
     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
 }
 
@@ -60,8 +70,8 @@ handle_mtu()
 {
     local mtu=$(xenstore-read "${PRIVATE}/MTU" 2>/dev/null)
     if [ $? -eq 0 -a -n "${mtu}" ]; then
-	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 $?"
+        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
 }
 
@@ -77,36 +87,37 @@ set_vif_external_id()
 
 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 "xs-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 "xs-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 "xs-network-uuid" "${net_uuid}"
     fi
-}
 
-xs550_set_internal_network_uuid()
-{
-    . /etc/xensource-inventory
-    if test "$PRODUCT_VERSION" = "5.5.0" || test "${BUILD_NUMBER%p}" -le 26131
-    then
+    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
+
+    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
@@ -117,14 +128,10 @@ xs550_set_internal_network_uuid()
         # the initial ovs-vswitchd connection to vNetManager and setting this
         # configuration variable, but vNetManager can tolerate that.
         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}"
         fi
-    else
-        # XAPI after 5.5.0 sets the network external ids itself, via ovs-vsctl.
-        :
     fi
 }
 
@@ -132,13 +139,13 @@ add_to_bridge()
 {
     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}"
 
@@ -149,34 +156,34 @@ add_to_bridge()
     ${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)
-	    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 $bridge)
-	    ;;
+    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)
-            # 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
-	    ;;
+    bridge)
+        # Nothing to do
+        ;;
+    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 --timeout=30 -- --if-exists del-port $dev
+        ;;
     esac
 }
 
@@ -191,28 +198,29 @@ else
 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}
-	;;
+        DOMID=`echo ${XENBUS_PATH} | cut -f 3 -d '/'`
+        DEVID=`echo ${XENBUS_PATH} | cut -f 4 -d '/'`
+        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}
@@ -222,37 +230,37 @@ PRIVATE=/xapi/${DOMID}/private/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"
+    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"
+    fi
+    logger -t scripts-vif "${dev} has been removed"
+    remove_from_bridge
+    ;;
 esac