# HG changeset patch
# User Ben Pfaff <blp@xxxxxxxxxx>
# Date 1278595886 -3600
# Node ID 8f19ee93a8b36482ffabf1501e8a1b61af1e3c05
# Parent  2bcd0bfcb66e53c3b88e8db0911e0f82247fdef5
[PATCH] vswitchd: Make names of Interface external_ids generic.

>From c0f9490c24649855f36b9cb426decd600e5c3115 Mon Sep 17 00:00:00 2001
Date: Fri, 12 Mar 2010 14:57:59 -0800
Until now the names of the external_ids keys used for Interface records
have implied that they are specific to XenServer, because they begin with
"xs-".  They are more generic in intent, however, so this commit removes
the "xs-" prefix and explains them more generically.

The Bridge record's external_ids still need renaming.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 vswitchd/vswitch.xml                |   36 +++++++++++++++++++++-------------
 scripts/vif |    8 +++---
 2 files changed, 26 insertions(+), 18 deletions(-)

diff -r 2bcd0bfcb66e -r 8f19ee93a8b3 scripts/vif
--- a/scripts/vif	Thu Jul 08 14:31:25 2010 +0100
+++ b/scripts/vif	Thu Jul 08 14:31:26 2010 +0100
@@ -92,7 +92,7 @@
 	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 @@
         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 @@
         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
 }