[PATCH] vswitchd: Make names of Bridge external_ids generic.

From 5c43922c13983d2b5addf9e6dd3f54a006c568a6 Mon Sep 17 00:00:00 2001
Date: Thu, 18 Mar 2010 09:37:31 -0700
Until now the names of the external_ids keys used for Bridge 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.

This finishes the renaming process started in commit c0f9490 "vswitchd:
Make names of Interface external_ids generic."

CC: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 tests/interface-reconfigure.at                     |   12 ++++++------
 vswitchd/vswitch.xml                               |   11 +++++++----
 xenserver/README                                   |    4 ++--
 xenserver/automake.mk                              |    2 +-
 scripts/vif                |    4 ++--
 ...ensource_libexec_InterfaceReconfigureVswitch.py |    8 ++++----
 ...usr_share_vswitch_scripts_refresh-network-uuids |   12 ++++++++++++
 ..._share_vswitch_scripts_refresh-xs-network-uuids |   12 ------------
 xenserver/vswitch-xen.spec                         |    6 +++---
 9 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100755 xenserver/usr_share_vswitch_scripts_refresh-network-uuids
 delete mode 100755 xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids

diff --git a/scripts/InterfaceReconfigureVswitch.py b/scripts/InterfaceReconfigureVswitch.py
index 5fb7a92bd0bed0f0b3f20155ce0acd0fba0cb9e2..6b60cb073e81b8608cb9252fe1b17a5c55af495e 100644 (file)
--- a/scripts/InterfaceReconfigureVswitch.py
+++ b/scripts/InterfaceReconfigureVswitch.py
@@ -333,9 +333,9 @@ def set_br_external_ids(pif):
         xs_network_uuids += [nwrec['uuid']]
 
     vsctl_argv = []
-    vsctl_argv += ['# configure xs-network-uuids']
+    vsctl_argv += ['# configure network-uuids']
     vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif),
-            'xs-network-uuids', ';'.join(xs_network_uuids)]
+            'network-uuids', ';'.join(xs_network_uuids)]
 
     vsctl_argv += ['# configure MAC']
     vsctl_argv += ['--', 'set', 'Interface', pif_ipdev_name(pif),
@@ -438,8 +438,8 @@ class DatapathVswitch(Datapath):
 
         #nw = db().get_pif_record(self._pif)['network']
         #nwrec = db().get_network_record(nw)
-        #vsctl_argv += ['# deconfigure xs-network-uuids']
-        #vsctl_argv += ['--del-entry=bridge.%s.xs-network-uuids=%s' % (bridge,nwrec['uuid'])]
+        #vsctl_argv += ['# deconfigure network-uuids']
+        #vsctl_argv += ['--del-entry=bridge.%s.network-uuids=%s' % (bridge,nwrec['uuid'])]
 
         log("deconfigure ipdev %s on %s" % (ipdev,bridge))
         vsctl_argv += ["# deconfigure ipdev %s" % ipdev]

diff --git a/scripts/vif b/scripts/vif
index ab9a56ee17a8295da6f6b9d03d724bf29df9bb32..56c710d814cfbd679b5ca23ddb171fa8384c6f6b 100755 (executable)
--- a/scripts/vif
+++ b/scripts/vif
@@ -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
 }