From 16e3f2effcddf838cc8927cc6fc8a968de0034bd Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Sat, 24 Sep 2011 23:37:07 -0700 Subject: 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 --- .../networking/etc/xensource/scripts/ovs_configure_vif_flows.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins') 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 accd08b91..d97d6686b 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) -- cgit