[ovs-dev] [PATCH 2/4] xenserver: Restore XS5.5 compatibility for vif script.
Ben Pfaff
blp at nicira.com
Fri Mar 12 23:08:22 UTC 2010
XAPI in XenServer 5.5 does not put the vif-uuid or network-uuid into
XenStore, so the vif script needs to query xapi for those attributes in
that case.
Tested with XenServer 5.5.0 update 1 and XenServer 5.5.9 build 29381
(the latter just to make sure I didn't break anything).
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
xenserver/etc_xensource_scripts_vif | 43 ++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 3a209f9..f186f27 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -25,6 +25,16 @@ 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%p}" -le 26131
+then
+ xs550=true
+else
+ xs550=false
+fi
+
handle_promiscuous()
{
local arg=$(xenstore-read "${PRIVATE}/other-config/promiscuous" 2>/dev/null)
@@ -77,8 +87,29 @@ set_vif_external_id()
handle_vswitch_vif_details()
{
+ local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null)
+ if $xs550 && [ -z "${vif_uuid}" ]; then
+ local vif_ref=$(xenstore-read "${PRIVATE}/ref" 2>/dev/null)
+ if [ -n "${vif_ref}" ]; then
+ # Get UUID for OpaqueRef:. xe doesn't document any way to do this,
+ # but it can be made to print the uuid as part of an error message
+ # on vif-param-get. The error message takes the form:
+ #
+ # The uuid you supplied was invalid.
+ # type: VIF
+ # uuid: 2c13f6d6-a567-f908-bdf1-a22746d675b2
+ vif_uuid=$(xe vif-param-get uuid="${vif_ref}" param-name=MTU 2>&1 | grep '^uuid:' | awk '{print $2}')
+ fi
+ fi
+ 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 $xs550 && [ -z "${net_uuid}" ] && [ -n "${vif_uuid}" ]; then
+ 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}"
fi
@@ -88,11 +119,6 @@ handle_vswitch_vif_details()
set_vif_external_id "xs-vif-mac" "${address}"
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 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)
@@ -104,9 +130,7 @@ handle_vswitch_vif_details()
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
@@ -122,9 +146,6 @@ xs550_set_internal_network_uuid()
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
}
--
1.6.6.1
More information about the dev
mailing list