# HG changeset patch
# User Ben Pfaff <blp@xxxxxxxxxx>
# Date 1278595886 -3600
# Node ID 6e16272df854306c6931c4ed1f022c90cebfb430
# Parent 8f19ee93a8b36482ffabf1501e8a1b61af1e3c05
[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@xxxxxxxxxx>
Signed-off-by: Ben Pfaff <blp@xxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
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 -r 8f19ee93a8b3 -r 6e16272df854 scripts/InterfaceReconfigureVswitch.py
--- a/scripts/InterfaceReconfigureVswitch.py Thu Jul 08 14:31:26 2010 +0100
+++ b/scripts/InterfaceReconfigureVswitch.py Thu Jul 08 14:31:26 2010 +0100
@@ -333,9 +333,9 @@
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 @@
#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 -r 8f19ee93a8b3 -r 6e16272df854 scripts/vif
--- a/scripts/vif Thu Jul 08 14:31:26 2010 +0100
+++ b/scripts/vif Thu Jul 08 14:31:26 2010 +0100
@@ -133,8 +133,8 @@
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
}
scripts/InterfaceReconfigureVswitch.py | 8 ++++----
scripts/vif | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
vswitchd_Make_names_of_Bridge_external_ids_generic.patch
Description: Text Data
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home