diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2011-09-24 23:37:07 -0700 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2011-09-24 23:40:26 -0700 |
| commit | 16e3f2effcddf838cc8927cc6fc8a968de0034bd (patch) | |
| tree | 9ab07ae6ff9f0ce22da8fffff8fee98fae073244 /plugins/xenserver/networking | |
| parent | bca7dd3e1d8bec758faf511338617f6d4121e0b8 (diff) | |
| download | nova-16e3f2effcddf838cc8927cc6fc8a968de0034bd.tar.gz | |
Use ovs-vsctl iface-to-br to look up the bridge associated with the given VIF.
This avoids assuming that vifX.Y is attached to xenbrY, which is untrue in
the general case.
Change-Id: Ie3398b4a2231e0483acae272be71cb09a1744872
Diffstat (limited to 'plugins/xenserver/networking')
| -rwxr-xr-x | plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py index accd08b916..d97d6686b9 100755 --- a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py +++ b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py @@ -51,7 +51,8 @@ def main(command, vif_raw, net_type): vif_name, dom_id, vif_index = vif_raw.split('-') vif = "%s%s.%s" % (vif_name, dom_id, vif_index) - bridge = "xenbr%s" % vif_index + + bridge = execute_get_output('/usr/bin/ovs-vsctl', 'iface-to-br', vif) xsls = execute_get_output('/usr/bin/xenstore-ls', '/local/domain/%s/vm-data/networking' % dom_id) |