[Xen-API] [PATCH 3 of 4] [PATCH] xenserver: Set internal network-uuids in Bridge table on XS5.5

[David Scott <dave.scott@xxxxxxxxxxxxx>]

# HG changeset patch
# User Justin Pettit <jpettit@xxxxxxxxxx>
# Date 1278595952 -3600
# Node ID 97c8b2a98657954d71a521a31080f7d6f2b6c310
# Parent  fe4fe62f8fab7c7aa10e3507f10c4956938bfddc
[PATCH] xenserver: Set internal network-uuids in Bridge table on XS5.5

>From 79eb8b002c588e6f7495a0cd73d8a0597a458442 Mon Sep 17 00:00:00 2001
Date: Wed, 21 Apr 2010 03:42:52 -0700
On XenServer 5.5, interface-reconfigure is not called when creating
internal bridges, so we jump through extra hoops to determine the
network UUIDs.  The code that handled this was not properly retrieving
the UUIDs from XAPI, so the field would never be set.  This commit
corrects that.

Bug #2666

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 scripts/vif |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff -r fe4fe62f8fab -r 97c8b2a98657 scripts/vif
--- a/scripts/vif       Thu Jul 08 14:32:32 2010 +0100
+++ b/scripts/vif       Thu Jul 08 14:32:32 2010 +0100
@@ -116,10 +116,7 @@
     if [ -n "${address}" ] ; then
        set_vif_external_id "vif-mac" "${address}"
     fi
-}
 
-xs550_set_internal_network_uuid()
-{
     if $xs550; then
         # vNetManager needs to know the network UUID(s) associated with each
         # datapath.  Normally interface-reconfigure adds them, but XAPI does
@@ -131,7 +128,6 @@
         # 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} network-uuids ${net_uuid}"
             echo "-- br-set-external-id $bridge network-uuids ${net_uuid}"
@@ -166,10 +162,10 @@
            ;;
        openvswitch)
            if [ "$TYPE" = "vif" ] ; then
-               local vif_details=$(handle_vswitch_vif_details)
+               local vif_details=$(handle_vswitch_vif_details $bridge)
            fi
 
-           $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev 
$vif_details $(xs550_set_internal_network_uuid $bridge)
+           $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev 
$vif_details
            ;;
     esac
            
 scripts/vif |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

Attachment: txtAErI7lG41A.txt
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api