[PATCH] xenserver: Prepend XenServer external ids with "xs-"

From c76fde78c528027fe95d714aba5ccf0f01407d75 Mon Sep 17 00:00:00 2001
Date: Mon, 9 Aug 2010 15:07:32 -0700
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 tests/interface-reconfigure.at                     |   12 ++++++------
 vswitchd/vswitch.xml                               |    2 +-
 xenserver/README                                   |    4 ++--
 xenserver/automake.mk                              |    2 +-
 scripts/vif                |   12 ++++++------
 xenserver/openvswitch-xen.spec                     |   10 +++++-----
 ...ensource_libexec_InterfaceReconfigureVswitch.py |    4 ++--
 ...share_openvswitch_scripts_refresh-network-uuids |    2 --
 ...re_openvswitch_scripts_refresh-xs-network-uuids |    2 ++
 9 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100755 xenserver/usr_share_openvswitch_scripts_refresh-network-uuids
 create mode 100755 xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids

diff --git a/scripts/InterfaceReconfigureVswitch.py b/scripts/InterfaceReconfigureVswitch.py
index 1e45759adf15ffcb006c13bf13c46598a6049872..9ebbbd8b9834e028cfadff5039f492a9d25250f7 100644 (file)
--- a/scripts/InterfaceReconfigureVswitch.py
+++ b/scripts/InterfaceReconfigureVswitch.py
@@ -345,9 +345,9 @@ def set_br_external_ids(pif):
         xs_network_uuids += [nwrec['uuid']]
 
     vsctl_argv = []
-    vsctl_argv += ['# configure network-uuids']
+    vsctl_argv += ['# configure xs-network-uuids']
     vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif),
-            'network-uuids', ';'.join(xs_network_uuids)]
+            'xs-network-uuids', ';'.join(xs_network_uuids)]
 
     return vsctl_argv
 

diff --git a/scripts/vif b/scripts/vif
index 90db779a50837be80161c183aff62056bede584e..942a88c3ffa7e030ac2ce2c2e4cf8efac336fff2 100755 (executable)
--- a/scripts/vif
+++ b/scripts/vif
@@ -82,22 +82,22 @@ handle_vswitch_vif_details()
         local vm_uuid=$(xenstore-read "$vm/uuid" 2>/dev/null)
     fi
     if [ -n "${vm_uuid}" ] ; then
-        set_vif_external_id "vm-uuid" "${vm_uuid}"
+        set_vif_external_id "xs-vm-uuid" "${vm_uuid}"
     fi
 
     local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null)
     if [ -n "${vif_uuid}" ] ; then
-       set_vif_external_id "vif-uuid" "${vif_uuid}"
+       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 [ -n "${net_uuid}" ] ; then
-       set_vif_external_id "network-uuid" "${net_uuid}"
+       set_vif_external_id "xs-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}"
+        set_vif_external_id "xs-vif-mac" "${address}"
     fi
 }