ovs-openflowd: Remove documentation for obsolete --mgmt-id option.

[openvswitch] / xenserver / etc_xensource_scripts_vif

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 02819045785f2695319a59bd3903bd580e45a3af..e82642953d7552d7a7d9b56bd75e9b77ade9a64a 100755 (executable)
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -28,7 +28,7 @@ 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%p}" -le 26131
+if test "$PRODUCT_VERSION" = "5.5.0" || test "${BUILD_NUMBER%[a-z]}" -le 26131
 then
     xs550=true
 else
@@ -46,8 +46,8 @@ handle_promiscuous()
                    *) 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
@@ -92,7 +92,7 @@ handle_vswitch_vif_details()
        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}"
+       set_vif_external_id "vm-uuid" "${vm_uuid}"
     fi
 
     local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null)
@@ -100,7 +100,7 @@ handle_vswitch_vif_details()
         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 vif_details=
@@ -109,12 +109,12 @@ handle_vswitch_vif_details()
         net_uuid=$(xe vif-param-get uuid="${vif_uuid}" param-name=network-uuid)
     fi
     if [ -n "${net_uuid}" ] ; then
-       set_vif_external_id "xs-network-uuid" "${net_uuid}"
+       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 "xs-vif-mac" "${address}"
+       set_vif_external_id "vif-mac" "${address}"
     fi
 }
 
@@ -133,8 +133,8 @@ xs550_set_internal_network_uuid()
         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
     fi
 }
@@ -164,7 +164,7 @@ add_to_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)
+       openvswitch)
            if [ "$TYPE" = "vif" ] ; then
                local vif_details=$(handle_vswitch_vif_details)
            fi
@@ -182,7 +182,7 @@ remove_from_bridge()
        bridge)
            # Nothing to do
            ;;
-       vswitch)
+       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.
@@ -202,7 +202,8 @@ 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