Merge "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."

2011-10-12 16:19:53 +00:00
parent 93378ee627 16e3f2effc
commit e47ddfd23e
1 changed files with 2 additions and 1 deletions
@@ -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)