[ovs-dev] [PATCH] xenserver: Cleanup xs-network-uuids and xs-network-names usage
Justin Pettit
jpettit at nicira.com
Mon Dec 14 22:31:55 UTC 2009
Switch xs-network-uuids delimiter to a semicolon to match the one used
by xs-network-uuids. Also, fix pluralization of xs-network-uuids in
vswitch IDL description of the "Bridge" table.
Add description of xs-network-names to vswitch IDL description.
---
vswitchd/vswitch-idl.ovsidl | 2 +-
.../opt_xensource_libexec_interface-reconfigure | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vswitchd/vswitch-idl.ovsidl b/vswitchd/vswitch-idl.ovsidl
index 2124c3c..9fd07dc 100644
--- a/vswitchd/vswitch-idl.ovsidl
+++ b/vswitchd/vswitch-idl.ovsidl
@@ -52,7 +52,7 @@
"comment": "Key-value pairs for configuring rarely used bridge features. The currently defined key-value pairs are: \"datapath-id\", exactly 12 hex digits to set the OpenFlow datapath ID to a specific value; \"hwaddr\", exactly 12 hex digits in the form \"XX:XX:XX:XX:XX:XX\" to set the hardware address of the local port and influence the datapath ID.",
"type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}},
"external_ids": {
- "comment": "Key-value pairs that identify this bridge's role in external systems. The currently defined key-value pairs are: \"xs-network-uuid\", a space-delimited set of the Citrix XenServer network UUIDs with which this bridge is associated.",
+ "comment": "Key-value pairs that identify this bridge's role in external systems. The currently defined key-value pairs are: \"xs-network-uuids\", a space-delimited set of the Citrix XenServer network UUIDs with which this bridge is associated; \"xs-network-names\", a semicolon-delimited set of Citrix XenServer network names with which this bridge is associated.",
"type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}}},
"Port": {
"comment": "A port within a Bridge. May contain a single Interface or multiple (bonded) Interfaces.",
diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 9a3ef82..de6043d 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -1459,7 +1459,7 @@ def action_up(pif):
xs_network_uuids += [nwrec['uuid']]
cfgmod_argv += ['# configure xs-network-uuids']
cfgmod_argv += ['--', 'br-set-external-id', bridge,
- 'xs-network-uuids', ' '.join(xs_network_uuids)]
+ 'xs-network-uuids', ';'.join(xs_network_uuids)]
if ipdev != bridge:
cfgmod_argv += ["# deconfigure ipdev %s" % ipdev]
--
1.5.5
More information about the dev
mailing list